From nobody Mon Dec 1 06:23:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkK6P9Dz6J9lb for ; Mon, 01 Dec 2025 06:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKYkK5V7Lz3BvV for ; Mon, 01 Dec 2025 06:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Prb7ibirxUtFpj5w4OSXS/FW8DXMhvj2oEyctK3wAI=; b=oDmx+CZhj+OaVtsXB7EZCg0WTGr+lgcWURdakC1UgNbsNPYJ4feXzrxyUVUXCFBKubZaLx HS/ssmW+md5bv7vjCPbXXV1ud5IhcQffBHfLAbcreFqrWLwwoNEUIQdhXe350qxYasIXg3 LrJsIhX2LFsveBDUqhbUl4+SNcBwJfgLQtCRkG2Aq1M9jimW2N9O18eg1MyIep4wGvWNeX nRa6i3Lnaib7ne1Z65mmKns+8Dlhkxko2PLQfYeTNoB3dQWzF6ITYgcK/QNhlxb5J2/dKd ng0rFtuLYJL4r7KK4+LAr4dnjMJgiKWQbltdKslaa1xrD+oxMQBTRCc0msEwqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Prb7ibirxUtFpj5w4OSXS/FW8DXMhvj2oEyctK3wAI=; b=h/7fRAZl6691aFnQm0sSLwhKTxYCjcG3iWOISJNeInzLAT6tiay+pdBiXtD6q5oCaOnlmm S8a12Vdhll/At5MrDEY/TGq9Mlj4GNJcA0l5e/QrPcl+B0nR6nHlU8SSkojmeuDudXo+OP LNiTitK54obR3ey68gtl1NrytLfelnTnYmbvG1hmPArqrcnceEJk8cgYxJn2qba+Tuxit1 3BThNoGoi+q9Aip4wTEDk4aFXJdxn8B/f7zrBP1l5KbygpTW8uzg3O9Mr28++Qu7ga6h/6 bzVihkQUa6sLKEWuv31Wn2qKhm4shAuwy051docRR2pJyFjTKaaXWh7ichhiKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764570201; a=rsa-sha256; cv=none; b=hOJtHWPQgMutWgKZ5Lpm/Be1zc4dLmvLYQpS8XKVGpsWoimB21UA6MP2/bIrQVo+IaxoaV 2PIRgU75i4rOZBJYRYSD2PE7oK8oFsdDKh/FaMZpto0wda52gh6qba5Xr1PwWo3jRnsOvN KlXREbCMEdyeNG0PCzlykl4ha1/ZpinZ381OnwFJoBHYKcx4Wd+f8N3Go+4XrjYfbN1mXx N8tOHnaHPEkbtTLiAJPINd3rW16j9zR7fjRlhLe97qKi54cIzK6PrKHJtCgYUP2F9ywfqo 94dPpJcbcnRgaByt4T0K2B2ZSNGqChx5eikjlYdHiKg7idb2zc1AN2kSuWf8lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkK4qWnz18Bp for ; Mon, 01 Dec 2025 06:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f9ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 06:23:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 3e3d7e590566 - main - ufshci: add helper to convert SCSI LUN to UPIU LUN formats List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e3d7e590566c7e1a55bfb0f084c9f64c6c46898 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 06:23:21 +0000 Message-Id: <692d3459.f9ca.1e27a8a1@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=3e3d7e590566c7e1a55bfb0f084c9f64c6c46898 commit 3e3d7e590566c7e1a55bfb0f084c9f64c6c46898 Author: Jaeyoon Choi AuthorDate: 2025-12-01 04:38:24 +0000 Commit: Jaeyoon Choi CommitDate: 2025-12-01 04:40:15 +0000 ufshci: add helper to convert SCSI LUN to UPIU LUN formats Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D53919 --- sys/dev/ufshci/ufshci.h | 2 ++ sys/dev/ufshci/ufshci_sim.c | 25 ++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/sys/dev/ufshci/ufshci.h b/sys/dev/ufshci/ufshci.h index b055d2d2d769..188f8c41def1 100644 --- a/sys/dev/ufshci/ufshci.h +++ b/sys/dev/ufshci/ufshci.h @@ -335,6 +335,8 @@ struct ufshci_upiu_header { uint8_t flags; }; uint8_t lun; +#define UFSHCI_UPIU_UNIT_NUMBER_ID_MASK 0x7f +#define UFSHCI_UPIU_WLUN_ID_MASK 0x80 uint8_t task_tag; /* dword 1 */ diff --git a/sys/dev/ufshci/ufshci_sim.c b/sys/dev/ufshci/ufshci_sim.c index 828b520614a5..1b80df089a46 100644 --- a/sys/dev/ufshci/ufshci_sim.c +++ b/sys/dev/ufshci/ufshci_sim.c @@ -72,6 +72,28 @@ ufshci_sim_illegal_request(union ccb *ccb) xpt_done(ccb); } +/* + * The SCSI LUN format and the UFS UPIU LUN format are different. + * This function converts the SCSI LUN format to the UFS UPIU LUN format. + */ +static uint8_t +ufshci_sim_translate_scsi_to_ufs_lun(lun_id_t scsi_lun) +{ + const int address_format_offset = 8; + uint8_t address_format = scsi_lun >> address_format_offset; + + /* Well known logical unit */ + if (((address_format & RPL_LUNDATA_ATYP_MASK) == + RPL_LUNDATA_ATYP_EXTLUN) && + ((address_format & RPL_LUNDATA_EXT_EAM_MASK) == + RPL_LUNDATA_EXT_EAM_WK)) + return ((scsi_lun & UFSHCI_UPIU_UNIT_NUMBER_ID_MASK) | + UFSHCI_UPIU_WLUN_ID_MASK); + + /* Logical unit */ + return (scsi_lun & UFSHCI_UPIU_UNIT_NUMBER_ID_MASK); +} + static void ufshchi_sim_scsiio(struct cam_sim *sim, union ccb *ccb) { @@ -129,7 +151,8 @@ ufshchi_sim_scsiio(struct cam_sim *sim, union ccb *ccb) upiu->header.trans_type = UFSHCI_UPIU_TRANSACTION_CODE_COMMAND; upiu->header.operational_flags = is_write ? UFSHCI_OPERATIONAL_FLAG_W : UFSHCI_OPERATIONAL_FLAG_R; - upiu->header.lun = csio->ccb_h.target_lun; + upiu->header.lun = ufshci_sim_translate_scsi_to_ufs_lun( + csio->ccb_h.target_lun); upiu->header.cmd_set_type = UFSHCI_COMMAND_SET_TYPE_SCSI; upiu->expected_data_transfer_length = htobe32(payload_len); From nobody Mon Dec 1 06:23:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkL6sdGz6JB51 for ; Mon, 01 Dec 2025 06:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKYkL66hVz3BsM for ; Mon, 01 Dec 2025 06:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5/i9LpIm2nn0LjwRYqL4jUCSHDBG7L5svBRPZN3Vq4=; b=V7vSdho9jXnv2vTTxMD2m0AjWTsuXPio8iAfkSNFB1uQVjhLnKYMNmaWQQMoSfUyA3S0Bl a1JYyM+FNFfhhDJzsZSFQZFLO3PaDVL2zHsSopoq2H9ZbBEDRN3oSlaXutNEzh6Xn7c0h8 B9aqRku2JVQvDTPnnjYL9c5vvQvNX4S0rH01I12P/hBDtdiqU7JcX1q7knlldtFCsXZ82G mJxbOtg+LcUTBk9lrdkt3uzEP6baA/8N92ROnH3DZmi5yNqVrx7wtNKHfbhPGK8umCnD54 qQKPLCcxJ80rN/1eS2DhnJMD/75Su8HCMKvNH0bXRqHHZgOaxA8YQuPd7J5Thg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5/i9LpIm2nn0LjwRYqL4jUCSHDBG7L5svBRPZN3Vq4=; b=oBwp0dchw83Nw0UpinEjspHBDfICfvDuc42xeYueny+VaUkslFUpwpl9Dbknwt6rIIdngK s/9VfOus6/basOPXSTDx5TNPQtf1u9PQ8GSa7ZTyn5YySDuwejAirRYUqCDU7CeGAgNtSx New+waDg9M0POUBUx0H/oM1F3lEfc5e0i1UqC9iHtsIX2SCHPvXS+JsHIfaAdZpBjmE3bg L6qJhI26sthfT/r9POWKK8V+YOE4W0L054R9JijV3LQB5pVFRtusziJXSjHWdJeqj2yRBn uCVg7CNrIE1P84kVZsNxVTCoU/H957qmYXgGyCOgjNUGx2lsUKrDeUJjB9dtYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764570202; a=rsa-sha256; cv=none; b=Ma+vC2g0qmNZdq6F1GPDCGG3OjUDcHeCTMZr1tg2GBLb/fS2G6yF/zm7MV/wh4YsIWbR6Z mLX9UU2drB9U3feE+sa1yOv3UkWhqeW2ZsBiPiVyCm2n/WEjFQcQLz52ix+mdVFIyLpNmV vT0brsstC3UK+nWHH1gZeGr+HsUnVBWWmUGR6kC7iWT3M9mNV5/f5eAvAoSwrAiEPGB6J/ AJ6/lmg7e4f3xukCUYV5Gti6cfmjiUeUHsgy+Z05LlyQA7n9TGgvYqr1YbPobOjhu2dA5h hGfDyfafqXWXMsnmAl19VO8tmNkLg304Qc7k7CVQv1Bep6wPsuAsAbpUT6tyNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkL5jgmz17n0 for ; Mon, 01 Dec 2025 06:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fdf1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 06:23:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: ba963776199f - main - cam/scsi: Support well known logical unit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba963776199f84775388a03d072121bf93707020 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 06:23:22 +0000 Message-Id: <692d345a.fdf1.6bbf87e1@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=ba963776199f84775388a03d072121bf93707020 commit ba963776199f84775388a03d072121bf93707020 Author: Jaeyoon Choi AuthorDate: 2025-12-01 04:38:52 +0000 Commit: Jaeyoon Choi CommitDate: 2025-12-01 04:40:31 +0000 cam/scsi: Support well known logical unit This patch adds an additional state to probe well-known logical units before probing normal logical units. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D53920 --- sys/cam/cam_ccb.h | 1 + sys/cam/cam_xpt.c | 1 + sys/cam/cam_xpt_internal.h | 1 + sys/cam/scsi/scsi_all.h | 2 +- sys/cam/scsi/scsi_xpt.c | 239 +++++++++++++++++++++++++++++---------------- 5 files changed, 161 insertions(+), 83 deletions(-) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index 1f110686a658..19f18f36b8c9 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -614,6 +614,7 @@ typedef enum { } pi_tmflag; typedef enum { + PIM_WLUNS = 0x400,/* Well known LUNs supported */ PIM_ATA_EXT = 0x200,/* ATA requests can understand ata_ext requests */ PIM_EXTLUNS = 0x100,/* 64bit extended LUNs supported */ PIM_SCANHILO = 0x80, /* Bus scans from high ID to low ID */ diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index a11b688c4456..ecf06045ed90 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -4682,6 +4682,7 @@ xpt_alloc_target(struct cam_eb *bus, target_id_t target_id) target->refcount = 1; target->generation = 0; target->luns = NULL; + target->wluns = NULL; mtx_init(&target->luns_mtx, "CAM LUNs lock", NULL, MTX_DEF); timevalclear(&target->last_reset); /* diff --git a/sys/cam/cam_xpt_internal.h b/sys/cam/cam_xpt_internal.h index 5a812e6e7d20..73f50895ee74 100644 --- a/sys/cam/cam_xpt_internal.h +++ b/sys/cam/cam_xpt_internal.h @@ -169,6 +169,7 @@ struct cam_et { struct timeval last_reset; u_int rpl_size; struct scsi_report_luns_data *luns; + struct scsi_report_luns_data *wluns; struct mtx luns_mtx; /* Protection for luns field. */ }; diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index b6fb66beefcd..e50974edac86 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -3057,7 +3057,7 @@ struct scsi_report_luns_data { uint8_t length[4]; /* length of LUN inventory, in bytes */ uint8_t reserved[4]; /* unused */ /* - * LUN inventory- we only support the type zero form for now. + * LUN inventory- we only support type zero and extended (well-known) formats. */ struct scsi_report_luns_lundata luns[0]; }; diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index bef35243af98..d0c170867b97 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -130,6 +130,7 @@ typedef enum { PROBE_TUR, PROBE_INQUIRY, /* this counts as DV0 for Basic Domain Validation */ PROBE_FULL_INQUIRY, + PROBE_REPORT_WLUNS, PROBE_REPORT_LUNS, PROBE_MODE_SENSE, PROBE_SUPPORTED_VPD_LIST, @@ -148,6 +149,7 @@ static char *probe_action_text[] = { "PROBE_TUR", "PROBE_INQUIRY", "PROBE_FULL_INQUIRY", + "PROBE_REPORT_WLUNS", "PROBE_REPORT_LUNS", "PROBE_MODE_SENSE", "PROBE_SUPPORTED_VPD_LIST", @@ -567,7 +569,7 @@ static int proberequestbackoff(struct cam_periph *periph, static void probedone(struct cam_periph *periph, union ccb *done_ccb); static void probe_purge_old(struct cam_path *path, struct scsi_report_luns_data *new, - probe_flags flags); + probe_flags flags, bool is_wlun); static void probecleanup(struct cam_periph *periph); static void scsi_find_quirk(struct cam_ed *device); static void scsi_scan_bus(struct cam_periph *periph, union ccb *ccb); @@ -817,6 +819,23 @@ again: /*timeout*/60 * 1000); break; } + case PROBE_REPORT_WLUNS: + { + void *rp; + + rp = malloc(periph->path->target->rpl_size, + M_CAMXPT, M_NOWAIT | M_ZERO); + if (rp == NULL) { + xpt_print(periph->path, + "Unable to alloc report wluns storage\n"); + PROBE_SET_ACTION(softc, PROBE_REPORT_LUNS); + goto again; + } + scsi_report_luns(csio, 5, probedone, MSG_SIMPLE_Q_TAG, + RPL_REPORT_WELLKNOWN, rp, periph->path->target->rpl_size, + SSD_FULL_SIZE, 60000); + break; + } case PROBE_REPORT_LUNS: { void *rp; @@ -1162,6 +1181,7 @@ probedone(struct cam_periph *periph, union ccb *done_ccb) struct cam_path *path; struct scsi_inquiry_data *inq_buf; uint32_t priority; + struct ccb_pathinq cpi; CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probedone\n")); @@ -1169,6 +1189,7 @@ probedone(struct cam_periph *periph, union ccb *done_ccb) path = done_ccb->ccb_h.path; priority = done_ccb->ccb_h.pinfo.priority; cam_periph_assert(periph, MA_OWNED); + xpt_path_inq(&cpi, path); switch (softc->action) { case PROBE_TUR: @@ -1235,8 +1256,10 @@ out: SID_ANSI_REV(inq_buf) > SCSI_REV_SPC2 && (SCSI_QUIRK(path->device)->quirks & CAM_QUIRK_NORPTLUNS) == 0) { - PROBE_SET_ACTION(softc, - PROBE_REPORT_LUNS); + if (cpi.hba_misc & PIM_WLUNS) + PROBE_SET_ACTION(softc, PROBE_REPORT_WLUNS); + else + PROBE_SET_ACTION(softc, PROBE_REPORT_LUNS); /* * Start with room for *one* lun. */ @@ -1259,7 +1282,10 @@ out: SID_ANSI_REV(inq_buf) >= SCSI_REV_SPC2 && (SCSI_QUIRK(path->device)->quirks & CAM_QUIRK_NORPTLUNS) == 0) { - PROBE_SET_ACTION(softc, PROBE_REPORT_LUNS); + if (cpi.hba_misc & PIM_WLUNS) + PROBE_SET_ACTION(softc, PROBE_REPORT_WLUNS); + else + PROBE_SET_ACTION(softc, PROBE_REPORT_LUNS); periph->path->target->rpl_size = 16; xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); @@ -1296,11 +1322,13 @@ out: xpt_release_ccb(done_ccb); break; } + case PROBE_REPORT_WLUNS: case PROBE_REPORT_LUNS: { struct ccb_scsiio *csio; struct scsi_report_luns_data *lp; u_int nlun, maxlun; + bool is_wlun = softc->action == PROBE_REPORT_WLUNS; csio = &done_ccb->csio; @@ -1377,7 +1405,7 @@ out: * This function will also install the new list * in the target structure. */ - probe_purge_old(path, lp, softc->flags); + probe_purge_old(path, lp, softc->flags, is_wlun); lp = NULL; } /* The processing above should either exit via a `goto @@ -1390,7 +1418,9 @@ out: if (path->device->flags & CAM_DEV_INQUIRY_DATA_VALID && (SID_QUAL(inq_buf) == SID_QUAL_LU_CONNECTED || SID_QUAL(inq_buf) == SID_QUAL_LU_OFFLINE)) { - if (INQ_DATA_TQ_ENABLED(inq_buf)) + if (is_wlun) + PROBE_SET_ACTION(softc, PROBE_REPORT_LUNS); + else if (INQ_DATA_TQ_ENABLED(inq_buf)) PROBE_SET_ACTION(softc, PROBE_MODE_SENSE); else PROBE_SET_ACTION(softc, @@ -1815,20 +1845,22 @@ probe_device_check: static void probe_purge_old(struct cam_path *path, struct scsi_report_luns_data *new, - probe_flags flags) + probe_flags flags, bool is_wlun) { struct cam_path *tp; - struct scsi_report_luns_data *old; + struct scsi_report_luns_data **luns_data, *old; u_int idx1, idx2, nlun_old, nlun_new; lun_id_t this_lun; uint8_t *ol, *nl; + luns_data = is_wlun ? &path->target->wluns : &path->target->luns; + if (path->target == NULL) { return; } mtx_lock(&path->target->luns_mtx); - old = path->target->luns; - path->target->luns = new; + old = *luns_data; + *luns_data = new; mtx_unlock(&path->target->luns_mtx); if (old == NULL) return; @@ -1908,11 +1940,16 @@ scsi_find_quirk(struct cam_ed *device) device->maxtags = quirk->maxtags; } +typedef struct { + int lun; + int wlun; +} lun_pair; + typedef struct { union ccb *request_ccb; struct ccb_pathinq *cpi; int counter; - int lunindex[0]; + lun_pair lunindex[0]; } scsi_scan_bus_info; static void @@ -1995,7 +2032,8 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb) /* Save some state for use while we probe for devices */ scan_info = (scsi_scan_bus_info *) malloc(sizeof(scsi_scan_bus_info) + - (work_ccb->cpi.max_target * sizeof (u_int)), M_CAMXPT, M_ZERO|M_NOWAIT); + (work_ccb->cpi.max_target * sizeof(lun_pair)), + M_CAMXPT, M_ZERO|M_NOWAIT); if (scan_info == NULL) { request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; xpt_free_ccb(work_ccb); @@ -2080,6 +2118,8 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb) path_id_t path_id; target_id_t target_id; lun_id_t lun_id; + u_int nwluns; + bool need_wlun_scan = false; oldpath = request_ccb->ccb_h.path; @@ -2093,89 +2133,124 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb) mtx = xpt_path_mtx(scan_info->request_ccb->ccb_h.path); mtx_lock(mtx); - mtx_lock(&target->luns_mtx); - if (target->luns) { - lun_id_t first; - u_int nluns = scsi_4btoul(target->luns->length) / 8; - /* - * Make sure we skip over lun 0 if it's the first member - * of the list as we've actually just finished probing - * it. - */ - CAM_GET_LUN(target->luns, 0, first); - if (first == 0 && scan_info->lunindex[target_id] == 0) { - scan_info->lunindex[target_id]++; - } - - /* - * Skip any LUNs that the HBA can't deal with. - */ - while (scan_info->lunindex[target_id] < nluns) { - if (scan_info->cpi->hba_misc & PIM_EXTLUNS) { - CAM_GET_LUN(target->luns, - scan_info->lunindex[target_id], - lun_id); - break; - } + if (scan_info->cpi->hba_misc & PIM_WLUNS) { + /* Scan Well known logical units */ + mtx_lock(&target->luns_mtx); - if (CAM_CAN_GET_SIMPLE_LUN(target->luns, - scan_info->lunindex[target_id])) { - CAM_GET_SIMPLE_LUN(target->luns, - scan_info->lunindex[target_id], - lun_id); - break; - } - - scan_info->lunindex[target_id]++; + if (target->wluns) { + nwluns = scsi_4btoul(target->wluns->length) / 8; + if (scan_info->lunindex[target_id].wlun < nwluns) + need_wlun_scan = true; } - if (scan_info->lunindex[target_id] < nluns) { + if (need_wlun_scan) { + /* + * WLUN uses the Extended WLUN address format, so we can handle all of + * them. + */ + CAM_GET_LUN(target->wluns, scan_info->lunindex[target_id].wlun, lun_id); + mtx_unlock(&target->luns_mtx); next_target = 0; CAM_DEBUG(request_ccb->ccb_h.path, - CAM_DEBUG_PROBE, - ("next lun to try at index %u is %jx\n", - scan_info->lunindex[target_id], - (uintmax_t)lun_id)); - scan_info->lunindex[target_id]++; + CAM_DEBUG_PROBE, + ("next wlun to try at index %u is %jx\n", + scan_info->lunindex[target_id].wlun, + (uintmax_t)lun_id)); + scan_info->lunindex[target_id].wlun++; } else { mtx_unlock(&target->luns_mtx); - /* We're done with scanning all luns. */ + /* We're done with scanning all wluns. */ } - } else { - mtx_unlock(&target->luns_mtx); - device = request_ccb->ccb_h.path->device; - /* Continue sequential LUN scan if: */ - /* -- we have more LUNs that need recheck */ - mtx_lock(&target->bus->eb_mtx); - nextdev = device; - while ((nextdev = TAILQ_NEXT(nextdev, links)) != NULL) - if ((nextdev->flags & CAM_DEV_UNCONFIGURED) == 0) - break; - mtx_unlock(&target->bus->eb_mtx); - if (nextdev != NULL) { - next_target = 0; - /* -- stop if CAM_QUIRK_NOLUNS is set. */ - } else if (SCSI_QUIRK(device)->quirks & CAM_QUIRK_NOLUNS) { - next_target = 1; - /* -- this LUN is connected and its SCSI version - * allows more LUNs. */ - } else if ((device->flags & CAM_DEV_UNCONFIGURED) == 0) { - if (lun_id < (CAM_SCSI2_MAXLUN-1) || - CAN_SRCH_HI_DENSE(device)) + } + + if (!need_wlun_scan) { + /* Scan logical units */ + mtx_lock(&target->luns_mtx); + if (target->luns) { + lun_id_t first; + u_int nluns = scsi_4btoul(target->luns->length) / 8; + + /* + * Make sure we skip over lun 0 if it's the first member + * of the list as we've actually just finished probing + * it. + */ + CAM_GET_LUN(target->luns, 0, first); + if (first == 0 && scan_info->lunindex[target_id].lun == 0) { + scan_info->lunindex[target_id].lun++; + } + + /* + * Skip any LUNs that the HBA can't deal with. + */ + while (scan_info->lunindex[target_id].lun < nluns) { + if (scan_info->cpi->hba_misc & PIM_EXTLUNS) { + CAM_GET_LUN(target->luns, + scan_info->lunindex[target_id].lun, + lun_id); + break; + } + + if (CAM_CAN_GET_SIMPLE_LUN(target->luns, + scan_info->lunindex[target_id].lun)) { + CAM_GET_SIMPLE_LUN(target->luns, + scan_info->lunindex[target_id].lun, + lun_id); + break; + } + + scan_info->lunindex[target_id].lun++; + } + + if (scan_info->lunindex[target_id].lun < nluns) { + mtx_unlock(&target->luns_mtx); next_target = 0; - /* -- this LUN is disconnected, its SCSI version - * allows more LUNs and we guess they may be. */ - } else if ((device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0) { - if (lun_id < (CAM_SCSI2_MAXLUN-1) || - CAN_SRCH_HI_SPARSE(device)) + CAM_DEBUG(request_ccb->ccb_h.path, + CAM_DEBUG_PROBE, + ("next lun to try at index %u is %jx\n", + scan_info->lunindex[target_id].lun, + (uintmax_t)lun_id)); + scan_info->lunindex[target_id].lun++; + } else { + mtx_unlock(&target->luns_mtx); + /* We're done with scanning all luns. */ + } + } else { + mtx_unlock(&target->luns_mtx); + device = request_ccb->ccb_h.path->device; + /* Continue sequential LUN scan if: */ + /* -- we have more LUNs that need recheck */ + mtx_lock(&target->bus->eb_mtx); + nextdev = device; + while ((nextdev = TAILQ_NEXT(nextdev, links)) != NULL) + if ((nextdev->flags & CAM_DEV_UNCONFIGURED) == 0) + break; + mtx_unlock(&target->bus->eb_mtx); + if (nextdev != NULL) { next_target = 0; - } - if (next_target == 0) { - lun_id++; - if (lun_id > scan_info->cpi->max_lun) + /* -- stop if CAM_QUIRK_NOLUNS is set. */ + } else if (SCSI_QUIRK(device)->quirks & CAM_QUIRK_NOLUNS) { next_target = 1; + /* -- this LUN is connected and its SCSI version + * allows more LUNs. */ + } else if ((device->flags & CAM_DEV_UNCONFIGURED) == 0) { + if (lun_id < (CAM_SCSI2_MAXLUN-1) || + CAN_SRCH_HI_DENSE(device)) + next_target = 0; + /* -- this LUN is disconnected, its SCSI version + * allows more LUNs and we guess they may be. */ + } else if ((device->flags & CAM_DEV_INQUIRY_DATA_VALID) != 0) { + if (lun_id < (CAM_SCSI2_MAXLUN-1) || + CAN_SRCH_HI_SPARSE(device)) + next_target = 0; + } + if (next_target == 0) { + lun_id++; + if (lun_id > scan_info->cpi->max_lun) + next_target = 1; + } } } From nobody Mon Dec 1 06:23:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkN1DKmz6JB54 for ; Mon, 01 Dec 2025 06:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKYkM70LZz3BmX for ; Mon, 01 Dec 2025 06:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NLFjAfiFBkBaHiNI/uzPS9OQE8X1S+GODG5il9EzpAg=; b=CogoZjqhmlwpQaMEcq41QJE+BPgPWnc/gRmM2leotcSQnwgrmpgxV+8ypdUf9sdkIfSqPM M8QVORFIWD6GR/DLt2IOKGfgva/tPij3pJqmctvO/bD3c8rIetUq6rrPybJ47SiixClqJY ZHovoaqKOe5jn77/OSMjg7PFRfTV0/q+GOM1qn914WO9xiZfcjSFEuvc3QwcbgQDrdMZU9 KkZw+RQ/GS8KRENcyo//oXUH0xzUtl5hsGzZNwvvq51ndeWmO2/8H+mwIeo1jNtaMK0prW Eryjms0NXq1TxQvDYVZOvgbEY4JKO6+pPFU/oraK8HNOte8O7leRaN4OdLm7KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NLFjAfiFBkBaHiNI/uzPS9OQE8X1S+GODG5il9EzpAg=; b=N0sTjXmUzhqGuscWsqQUEu/MMrgAVcWTqLrVhOw1DOn4mb6BmwtF6ueHHUb56u4M/ZNOLj WCA6a1mBoUW13ttk473t+xpkBK3K1NWoX5H2aBB9zSB2iXcdzOxmak1wUhH4kRPRErzHGx cZpw2cyDt0svzkaX3UU6HRbIgYFBSd4JcU1hjcTvfriY2pY5ilDwSUITZug1EOZdgnUb1I 1pwPyJzJ8usUHKokNJXsLX2BH9poncgQYSBZOR8gLwg9sDzqW/vGJON1lz9BuL+uLs6G52 Czq0mjzEl5NcIK9Jwqc2K7yeERXoAPXvEg2LrFDFXxhXDv2XK6uGFvLjIiIRLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764570204; a=rsa-sha256; cv=none; b=Rc7NxSIyM3OjDX87GIvpeTh6BQzssJL/Nwwn0NqO1IvVo8fw8v+1ejCDvQGkBYFi/j2xHG 7SlJF1kEQ5hkbQjNtJ34E4+Lq/ITGSxxDauTH6vXLoLy+X8xiYcHEJPDxogExjFMyUEQhL Gq4R+KFOp93ANCbv6O4Hohem3fqgwfR04iR8fdRK9wSPvTYeTRoEN9QnR9jweIUAE3/pJM B5+kHQQrBrgmUMb1oWB6jLv8kyv2i6vDXtDyLSzBIB7j2YRAG0qRLjAW1KYhcz0f9EpO8S n4xVh49YFK0hhHhPN7/2NzGhtJPaLPwTrgXe+l5qX7P8j3i28TODqL3uNpL3ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkM6TCLz18Bs for ; Mon, 01 Dec 2025 06:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 220e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 06:23:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 5e0d065b5b90 - main - ufshci: Enable WLUN scan List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e0d065b5b90d4f4264d8248f39f199f1a2576dc Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 06:23:23 +0000 Message-Id: <692d345b.220e1.448a51c@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=5e0d065b5b90d4f4264d8248f39f199f1a2576dc commit 5e0d065b5b90d4f4264d8248f39f199f1a2576dc Author: Jaeyoon Choi AuthorDate: 2025-12-01 04:39:14 +0000 Commit: Jaeyoon Choi CommitDate: 2025-12-01 04:40:42 +0000 ufshci: Enable WLUN scan QEMU ufs device does not implement WLUN, so QUIRK is added. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D53921 --- sys/dev/ufshci/ufshci.h | 8 ++++++++ sys/dev/ufshci/ufshci_pci.c | 3 ++- sys/dev/ufshci/ufshci_private.h | 2 ++ sys/dev/ufshci/ufshci_sim.c | 6 +++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/dev/ufshci/ufshci.h b/sys/dev/ufshci/ufshci.h index 188f8c41def1..766d8de0535b 100644 --- a/sys/dev/ufshci/ufshci.h +++ b/sys/dev/ufshci/ufshci.h @@ -644,6 +644,14 @@ struct ufshci_completion { typedef void (*ufshci_cb_fn_t)(void *, const struct ufshci_completion *, bool); +/* UFS 4.1, section 10.8.5 "Well Known Logical Unit Defined in UFS" */ +enum ufshci_well_known_luns { + UFSHCI_WLUN_REPORT_LUNS = 0x81, + UFSHCI_WLUN_BOOT = 0xb0, + UFSHCI_WLUN_RPMB = 0xc4, + UFSHCI_WLUN_UFS_DEVICE = 0xd0, +}; + /* * UFS Spec 4.1, section 14.1 "UFS Descriptors" * All descriptors use big-endian byte ordering. diff --git a/sys/dev/ufshci/ufshci_pci.c b/sys/dev/ufshci/ufshci_pci.c index 992026fd4f4d..7f78e462db72 100644 --- a/sys/dev/ufshci/ufshci_pci.c +++ b/sys/dev/ufshci/ufshci_pci.c @@ -50,7 +50,8 @@ static struct _pcsid { uint32_t quirks; } pci_ids[] = { { 0x131b36, "QEMU UFS Host Controller", UFSHCI_REF_CLK_19_2MHz, UFSHCI_QUIRK_IGNORE_UIC_POWER_MODE | - UFSHCI_QUIRK_NOT_SUPPORT_ABORT_TASK }, + UFSHCI_QUIRK_NOT_SUPPORT_ABORT_TASK | + UFSHCI_QUIRK_SKIP_WELL_KNOWN_LUNS }, { 0x98fa8086, "Intel Lakefield UFS Host Controller", UFSHCI_REF_CLK_19_2MHz, UFSHCI_QUIRK_LONG_PEER_PA_TACTIVATE | diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index ec388c06e248..3cee021880a8 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -266,6 +266,8 @@ struct ufshci_controller { 8 /* Need to change the number of lanes before changing HS-GEAR. */ #define UFSHCI_QUIRK_NOT_SUPPORT_ABORT_TASK \ 16 /* QEMU does not support Task Management Request */ +#define UFSHCI_QUIRK_SKIP_WELL_KNOWN_LUNS \ + 32 /* QEMU does not support Well known logical units*/ uint32_t ref_clk; diff --git a/sys/dev/ufshci/ufshci_sim.c b/sys/dev/ufshci/ufshci_sim.c index 1b80df089a46..db2e194b699b 100644 --- a/sys/dev/ufshci/ufshci_sim.c +++ b/sys/dev/ufshci/ufshci_sim.c @@ -231,11 +231,15 @@ ufshci_cam_action(struct cam_sim *sim, union ccb *ccb) return; case XPT_PATH_INQ: { struct ccb_pathinq *cpi = &ccb->cpi; + uint32_t need_scan_wluns = 0; + + if (!(ctrlr->quirks & UFSHCI_QUIRK_SKIP_WELL_KNOWN_LUNS)) + need_scan_wluns = PIM_WLUNS; cpi->version_num = 1; cpi->hba_inquiry = PI_SDTR_ABLE | PI_TAG_ABLE; cpi->target_sprt = 0; - cpi->hba_misc = PIM_UNMAPPED | PIM_NO_6_BYTE; + cpi->hba_misc = need_scan_wluns | PIM_UNMAPPED | PIM_NO_6_BYTE; cpi->hba_eng_cnt = 0; cpi->max_target = 0; cpi->max_lun = ctrlr->max_lun_count; From nobody Mon Dec 1 06:23:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkP2Mm5z6J9fc for ; Mon, 01 Dec 2025 06:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKYkP0TsKz3BqP for ; Mon, 01 Dec 2025 06:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=21sQ0Xl0UP7wjILRyeQZrYRrsxYpQZISibSGr+4OVgU=; b=Q4HbURT62MieF6u36jjYWFNh2oGlqK69+x0XfRErG1je1yqERJiWhHb4p3QtqDdnvr0VwY 858DKC4N7L9zZHyVaoAq5ywS1Uc4B8OpS+xtHeSRNfheLqLWwFlwmxNIXpg5UFfEwvaxhr 3hdOC9fYoLDkUA/zBk6bDwVIaUz0+HaCM3D+h0fCInv119k16cuEkd8TDrSUEVlKekU9vF V0+v6ZB0AIMX2pRg3/28SKn13pe83mkzsccW7KVgbPE2l6H3Vr6oM5hblRAjaXxRdHNgd5 FrXgQQEwypl5h/5gQRrT5fZ9+jJCz4hPEfC1IyOniIBcPD+GXCE8tTln2gtp+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=21sQ0Xl0UP7wjILRyeQZrYRrsxYpQZISibSGr+4OVgU=; b=ipnx4s4V1oaVuGexv1fB6cmkL5Sd31x7MN/o44zA/kNsiSwwFYZXtOVagPuR10sEWjYOmd tdBm0U7rlBK6DlDuoXJwgrqCbVOHsHSX0QxnOMwsddSDBwj5znndZdDFUF9LiWD2IJJdaU 8YJlOgUNGUI7u9mAiFzBNq9O61j2qtslN7Jhur/PjwHPVrWv2lSXg7TiuQDM6DQIsoeOMa z7payKHc80ITNugTmeuCOsVk1jM8+artzKAiy1xyDGKAX6cpxqKp9NSMNBsG0EzyaYkL0e 1j1g4VQt3LvKm5+sELECWB7xTBQd0vi9DzzRwuDhN4ZGL+Go9Qnhqx+LlSuBbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764570205; a=rsa-sha256; cv=none; b=hs0AEk1Lh2unFr/yM3BuWlFzEHxPaxj1XeMQiI4DvoT/o4EPMCLtVbdM72fUga+TEc80Wx GRlIUNOAvaj9WDQilC644HhzdW3X7TIqhsvL9HmCswhCd3OpoQ20VlZ19JsrpJFhnh2sik 6ImN3LyVEdB91qMEzrpbUw4QXvgz+87CKQhkpwfJKtRfX7PqalXxIjkRWRiyPLr4HgHrwi 9wwKAygotItL9gfJNj6XG5E0iBS9g0WYXKQNkSprw7xeZa4o9Rs9MRm0T9HnV2OfbB7okE XsrySiVXAWWuqqi0H3SHfF06vGNkBaOZX5vm298ejphDUgkUQE02HcsksNsqHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkP019Bz18SQ for ; Mon, 01 Dec 2025 06:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 215b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 06:23:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 8c35de4982d8 - main - cam/scsi: Add power condition support to START STOP UNIT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c35de4982d855950a900483513f341643f6158f Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 06:23:24 +0000 Message-Id: <692d345c.215b3.71d84ece@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=8c35de4982d855950a900483513f341643f6158f commit 8c35de4982d855950a900483513f341643f6158f Author: Jaeyoon Choi AuthorDate: 2025-12-01 04:39:35 +0000 Commit: Jaeyoon Choi CommitDate: 2025-12-01 04:40:52 +0000 cam/scsi: Add power condition support to START STOP UNIT This patch adds a power_condition parameter to the scsi_start_stop() function and sets the power condition via SSU. Reviewed by: imp (mentor) Sponsored by: Samsung Electronic Differential Revision: https://reviews.freebsd.org/D53922 --- sbin/camcontrol/camcontrol.c | 1 + sys/cam/cam_periph.c | 1 + sys/cam/scsi/scsi_all.c | 4 +++- sys/cam/scsi/scsi_all.h | 3 ++- sys/cam/scsi/scsi_cd.c | 2 ++ sys/dev/mpr/mpr_sas_lsi.c | 1 + sys/dev/mps/mps_sas_lsi.c | 1 + 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 15a5d42a2ba5..8da0c97b02a9 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -1024,6 +1024,7 @@ scsistart(struct cam_device *device, int startstop, int loadeject, /* start/stop */ startstop, /* load_eject */ loadeject, /* immediate */ 0, + /* power_condition */ SSS_PC_START_VALID, /* sense_len */ SSD_FULL_SIZE, /* timeout */ timeout ? timeout : 120000); diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 730656684e2a..e485ecff8736 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -1791,6 +1791,7 @@ camperiphscsisenseerror(union ccb *ccb, union ccb **orig, /*start*/TRUE, /*load/eject*/le, /*immediate*/FALSE, + /*power_condition*/SSS_PC_START_VALID, SSD_FULL_SIZE, /*timeout*/50000); break; diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c index fd128e69f1f1..168cd17d3965 100644 --- a/sys/cam/scsi/scsi_all.c +++ b/sys/cam/scsi/scsi_all.c @@ -8984,7 +8984,8 @@ void scsi_start_stop(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), uint8_t tag_action, int start, int load_eject, - int immediate, uint8_t sense_len, uint32_t timeout) + int immediate, uint8_t power_condition, uint8_t sense_len, + uint32_t timeout) { struct scsi_start_stop_unit *scsi_cmd; int extra_flags = 0; @@ -8999,6 +9000,7 @@ scsi_start_stop(struct ccb_scsiio *csio, uint32_t retries, } if (load_eject != 0) scsi_cmd->how |= SSS_LOEJ; + scsi_cmd->how |= power_condition; if (immediate != 0) scsi_cmd->byte2 |= SSS_IMMED; diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index e50974edac86..fb3ed8ee4458 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -4326,7 +4326,8 @@ void scsi_unmap(struct ccb_scsiio *csio, uint32_t retries, void scsi_start_stop(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), uint8_t tag_action, int start, int load_eject, - int immediate, uint8_t sense_len, uint32_t timeout); + int immediate, uint8_t power_condition, uint8_t sense_len, + uint32_t timeout); void scsi_read_attribute(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), uint8_t tag_action, uint8_t service_action, diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index e622a96ec77e..bc4634562dc6 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -3406,6 +3406,7 @@ cdstartunit(struct cam_periph *periph, int load) /* start */ TRUE, /* load_eject */ load, /* immediate */ FALSE, + /* power_condition */ SSS_PC_START_VALID, /* sense_len */ SSD_FULL_SIZE, /* timeout */ 50000); @@ -3434,6 +3435,7 @@ cdstopunit(struct cam_periph *periph, uint32_t eject) /* start */ FALSE, /* load_eject */ eject, /* immediate */ FALSE, + /* power_condition */ SSS_PC_START_VALID, /* sense_len */ SSD_FULL_SIZE, /* timeout */ 50000); diff --git a/sys/dev/mpr/mpr_sas_lsi.c b/sys/dev/mpr/mpr_sas_lsi.c index d9744b1054c2..9ba776e49e7a 100644 --- a/sys/dev/mpr/mpr_sas_lsi.c +++ b/sys/dev/mpr/mpr_sas_lsi.c @@ -1517,6 +1517,7 @@ mprsas_SSU_to_SATA_devices(struct mpr_softc *sc, int howto) /*start*/FALSE, /*load/eject*/0, /*immediate*/FALSE, + /*power_condition*/SSS_PC_START_VALID, MPR_SENSE_LEN, /*timeout*/10000); xpt_action(ccb); diff --git a/sys/dev/mps/mps_sas_lsi.c b/sys/dev/mps/mps_sas_lsi.c index e2d1ef2b013a..42119b5c0a43 100644 --- a/sys/dev/mps/mps_sas_lsi.c +++ b/sys/dev/mps/mps_sas_lsi.c @@ -1153,6 +1153,7 @@ mpssas_SSU_to_SATA_devices(struct mps_softc *sc, int howto) /*start*/FALSE, /*load/eject*/0, /*immediate*/FALSE, + /*power_condition*/SSS_PC_START_VALID, MPS_SENSE_LEN, /*timeout*/10000); xpt_action(ccb); From nobody Mon Dec 1 06:23:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkQ3VJ2z6JB8L for ; Mon, 01 Dec 2025 06:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKYkQ1N0Qz4B7x for ; Mon, 01 Dec 2025 06:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dp33lfZKjd8WHugZtxl0/szZalyvUIBQXlJ6znt/aBI=; b=dMTteQPHufUdp5NaQwX28KmaFDGGEryWgq7s+jDQaP+muPSaik+BNaTtEL9NmntfZ8PfGL EL1OyXOgFLRRdIMdYWXD9pdeGBcFLpCgaAsa3hSo9iFvhwo8AUq0ZoC9J/gWy5QmlNMvGe wpdfA3cLfeEsdzw7ov6OBu5x9/r0EmsBTsFxB2DZFashjbdrzUow9/PkYRLU6L/RGixYXw FI0yADfhGaehUX3uxGKHlsiV1Ns24Hj5gt+JyS6KNZvOUmEy2arPuPj/CxXNoAkNvxX12G uO+cwi0JXTphEV6p2/25+vgv7zbiRN0iE0e3aZtF6CUyLzg/Q/kephEnjxxt0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764570206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dp33lfZKjd8WHugZtxl0/szZalyvUIBQXlJ6znt/aBI=; b=ARiIAtxUwQYhsMhOZDOfIw5mH4SikqvS7pq2HvzFY/9C+pXk11yBAtZ40Dw/QP68JA+4XM 9ZDSFisHHh8KFwnLc8/DXRpZ3FKvSlJsuytOB7GPB+qgZ1rhddKa1CYYhkd0TLaDl8EPRg 3jElSjOsjB4LsrVPDBxO2rbe+zDqrPaIyZ99RSLhHa7L4HZq3KksC15v4gaY4Wi1tMGF1O xJXE0J9i5h4rwYwK+Fo3vaSFBgQ3088UbBOQGrClnk7LpjeuJCQ1rywM4Ml+skoFGlP8E1 YkvYLtxqubMr5p1naEuqAaaa20TVKt690wxfISK/aOTXzk/2RnvdP58tq7Ublg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764570206; a=rsa-sha256; cv=none; b=DjPeBKy8rOkysdOKUAH/WaLfrCrvOaYUiD1YkEalyCxmpEeQqklOKX9GR1aqvzIY7AQ6q7 Kz+aJVlQb/yonUV5sq4YEwnVhS+39o+xzQ2FrDmlynnGt2nKmDJQEq6DvrmD2smxkp+xlM 8PpB57hKuonYY6H0+RzYfJMwuyIY6NHrQzH2y1iFp3+LiKNbblLZ3vtpsvJ+bng+SNnnkt Crf0FQ0CZkUcIPCJM/HBABQ+v4tYCG0vJ5djw4UI2uqQcu8jcNDYuWd6UoDiNbNVbEjLop l51W4XIkAyXL084SAo8IjdXXyGJSZqK8IbpOJ+NsRKlYl3yil1lzafN9hJfG3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKYkQ0rSnz17n3 for ; Mon, 01 Dec 2025 06:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22563 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 06:23:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 31407551c3d4 - main - ufshci: Add a check for WLUN during driver initialization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31407551c3d4d29905f77abddac3fd9b649e166b Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 06:23:26 +0000 Message-Id: <692d345e.22563.31bf9335@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=31407551c3d4d29905f77abddac3fd9b649e166b commit 31407551c3d4d29905f77abddac3fd9b649e166b Author: Jaeyoon Choi AuthorDate: 2025-12-01 04:39:49 +0000 Commit: Jaeyoon Choi CommitDate: 2025-12-01 04:41:03 +0000 ufshci: Add a check for WLUN during driver initialization This patch checks whether wlun is registered as a periph device. It also implements a function to issue an SSU. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D53923 --- sys/dev/ufshci/ufshci_ctrlr.c | 12 ++--- sys/dev/ufshci/ufshci_dev.c | 14 ++++- sys/dev/ufshci/ufshci_private.h | 14 +++++ sys/dev/ufshci/ufshci_sim.c | 114 +++++++++++++++++++++++++++++++++++++++- sys/dev/ufshci/ufshci_sysctl.c | 4 ++ 5 files changed, 150 insertions(+), 8 deletions(-) diff --git a/sys/dev/ufshci/ufshci_ctrlr.c b/sys/dev/ufshci/ufshci_ctrlr.c index 35663b480cfa..1ffa99255088 100644 --- a/sys/dev/ufshci/ufshci_ctrlr.c +++ b/sys/dev/ufshci/ufshci_ctrlr.c @@ -79,12 +79,6 @@ ufshci_ctrlr_start(struct ufshci_controller *ctrlr, bool resetting) return; } - /* Initialize UFS Power Mode */ - if (ufshci_dev_init_ufs_power_mode(ctrlr) != 0) { - ufshci_ctrlr_fail(ctrlr); - return; - } - /* Read Controller Descriptor (Device, Geometry) */ if (ufshci_dev_get_descriptor(ctrlr) != 0) { ufshci_ctrlr_fail(ctrlr); @@ -109,6 +103,12 @@ ufshci_ctrlr_start(struct ufshci_controller *ctrlr, bool resetting) return; } + /* Initialize UFS Power Mode */ + if (ufshci_dev_init_ufs_power_mode(ctrlr) != 0) { + ufshci_ctrlr_fail(ctrlr); + return; + } + TSEXIT(); } diff --git a/sys/dev/ufshci/ufshci_dev.c b/sys/dev/ufshci/ufshci_dev.c index 975468e5156f..9696e8ea8091 100644 --- a/sys/dev/ufshci/ufshci_dev.c +++ b/sys/dev/ufshci/ufshci_dev.c @@ -455,8 +455,20 @@ ufshci_dev_init_uic_power_mode(struct ufshci_controller *ctrlr) int ufshci_dev_init_ufs_power_mode(struct ufshci_controller *ctrlr) { - /* TODO: Need to implement */ + ctrlr->ufs_dev.power_mode_supported = false; + if (ctrlr->quirks & UFSHCI_QUIRK_SKIP_WELL_KNOWN_LUNS) + return (0); + + ctrlr->ufs_device_wlun_periph = ufshci_sim_find_periph(ctrlr, + UFSHCI_WLUN_UFS_DEVICE); + if (ctrlr->ufs_device_wlun_periph == NULL) { + ufshci_printf(ctrlr, + "Well-known LUN `UFS Device (0x50)` not found\n"); + return (0); + } + + ctrlr->ufs_dev.power_mode_supported = true; return (0); } diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index 3cee021880a8..22e77c9b9326 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -31,6 +31,8 @@ #include +#include + #include "ufshci.h" MALLOC_DECLARE(M_UFSHCI); @@ -247,6 +249,9 @@ struct ufshci_device { uint32_t wb_user_space_config_option; uint8_t wb_dedicated_lu; uint32_t write_booster_flush_threshold; + + /* Power mode */ + bool power_mode_supported; }; /* @@ -274,6 +279,9 @@ struct ufshci_controller { struct cam_sim *ufshci_sim; struct cam_path *ufshci_path; + struct cam_periph *ufs_device_wlun_periph; + struct mtx ufs_device_wlun_mtx; + struct mtx sc_mtx; uint32_t sc_unit; uint8_t sc_name[16]; @@ -371,8 +379,14 @@ void ufshci_completion_poll_cb(void *arg, const struct ufshci_completion *cpl, bool error); /* SIM */ +uint8_t ufshci_sim_translate_scsi_to_ufs_lun(lun_id_t scsi_lun); +uint64_t ufshci_sim_translate_ufs_to_scsi_lun(uint8_t ufs_lun); int ufshci_sim_attach(struct ufshci_controller *ctrlr); void ufshci_sim_detach(struct ufshci_controller *ctrlr); +struct cam_periph *ufshci_sim_find_periph(struct ufshci_controller *ctrlr, + uint8_t wlun); +int ufshci_sim_send_ssu(struct ufshci_controller *ctrlr, bool start, + int pwr_cond, bool immed); /* Controller */ int ufshci_ctrlr_construct(struct ufshci_controller *ctrlr, device_t dev); diff --git a/sys/dev/ufshci/ufshci_sim.c b/sys/dev/ufshci/ufshci_sim.c index db2e194b699b..0cd691de47e2 100644 --- a/sys/dev/ufshci/ufshci_sim.c +++ b/sys/dev/ufshci/ufshci_sim.c @@ -10,9 +10,11 @@ #include #include #include +#include #include #include #include +#include #include "ufshci_private.h" @@ -76,7 +78,7 @@ ufshci_sim_illegal_request(union ccb *ccb) * The SCSI LUN format and the UFS UPIU LUN format are different. * This function converts the SCSI LUN format to the UFS UPIU LUN format. */ -static uint8_t +uint8_t ufshci_sim_translate_scsi_to_ufs_lun(lun_id_t scsi_lun) { const int address_format_offset = 8; @@ -94,6 +96,19 @@ ufshci_sim_translate_scsi_to_ufs_lun(lun_id_t scsi_lun) return (scsi_lun & UFSHCI_UPIU_UNIT_NUMBER_ID_MASK); } +uint64_t +ufshci_sim_translate_ufs_to_scsi_lun(uint8_t ufs_lun) +{ + /* Logical unit */ + if (!(ufs_lun & UFSHCI_UPIU_WLUN_ID_MASK)) { + return ufs_lun; + } + + /* Well known logical unit */ + return (((uint64_t)ufs_lun & ~UFSHCI_UPIU_WLUN_ID_MASK) | + (RPL_LUNDATA_ATYP_EXTLUN | RPL_LUNDATA_EXT_EAM_WK) << 8); +} + static void ufshchi_sim_scsiio(struct cam_sim *sim, union ccb *ccb) { @@ -396,3 +411,100 @@ ufshci_sim_detach(struct ufshci_controller *ctrlr) ctrlr->ufshci_sim = NULL; } } + +struct cam_periph * +ufshci_sim_find_periph(struct ufshci_controller *ctrlr, uint8_t wlun) +{ + struct cam_path *path; + struct cam_periph *periph = NULL; + uint64_t scsi_lun; + uint64_t timeout; + + scsi_lun = ufshci_sim_translate_ufs_to_scsi_lun(wlun); + + if (xpt_create_path(&path, /*periph*/ NULL, + cam_sim_path(ctrlr->ufshci_sim), 0, scsi_lun) != CAM_REQ_CMP) { + return NULL; + } + + /* Wait for the perip device to be found */ + timeout = ticks + MSEC_2_TICKS(ctrlr->device_init_timeout_in_ms); + + while (1) { + xpt_path_lock(path); + periph = cam_periph_find(path, "pass"); + xpt_path_unlock(path); + + if (periph) { + xpt_free_path(path); + break; + } + + if (timeout - ticks < 0) { + ufshci_printf(ctrlr, + "Failed to find the Well known LUN(0x%x)\n", wlun); + break; + } + + pause_sbt("ufshci_find_periph", ustosbt(100), 0, C_PREL(1)); + } + + return periph; +} + +/* This function is called during suspend/resume. */ +int +ufshci_sim_send_ssu(struct ufshci_controller *ctrlr, bool start, + int power_condition, bool immed) +{ + struct cam_periph *periph = ctrlr->ufs_device_wlun_periph; + union ccb *ccb; + int err; + + /* Acquire periph reference */ + if (periph && cam_periph_acquire(periph) != 0) { + periph = NULL; + } + + if (periph == NULL) { + /* If the periph device does not exist, it will try to find it + * again */ + periph = ufshci_sim_find_periph(ctrlr, + (uint8_t)UFSHCI_WLUN_UFS_DEVICE); + if (periph) + ctrlr->ufs_device_wlun_periph = periph; + } + + if (periph == NULL) { + ufshci_printf(ctrlr, + "Well-known LUN `UFS Device (0x50)` not found\n"); + return ENODEV; + } + cam_periph_lock(periph); + ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); + if (!ccb) { + cam_periph_unlock(periph); + cam_periph_release(periph); + return ENOMEM; + } + + scsi_start_stop(&ccb->csio, + /*retries*/ 4, + /*cbfcnp*/ NULL, + /*tag_action*/ MSG_SIMPLE_Q_TAG, + /*start*/ start ? 1 : 0, + /*load_eject*/ 0, + /*immediate*/ immed ? 1 : 0, + /*power_condition*/ power_condition, SSD_MIN_SIZE, + ctrlr->device_init_timeout_in_ms); + + ccb->ccb_h.flags |= CAM_DIR_NONE | CAM_DEV_QFRZDIS; + + err = cam_periph_runccb(ccb, NULL, 0, SF_RETRY_UA, NULL); + + cam_periph_unlock(periph); + /* Release periph reference */ + cam_periph_release(periph); + + return (err == 0) ? 0 : EIO; +} diff --git a/sys/dev/ufshci/ufshci_sysctl.c b/sys/dev/ufshci/ufshci_sysctl.c index 56bc06b13f3c..3ec4ea935464 100644 --- a/sys/dev/ufshci/ufshci_sysctl.c +++ b/sys/dev/ufshci/ufshci_sysctl.c @@ -197,6 +197,10 @@ ufshci_sysctl_initialize_ctrlr(struct ufshci_controller *ctrlr) &dev->wb_user_space_config_option, 0, "WriteBooster preserve user space mode"); + SYSCTL_ADD_BOOL(ctrlr_ctx, ctrlr_list, OID_AUTO, "power_mode_supported", + CTLFLAG_RD, &dev->power_mode_supported, 0, + "Device power mode support"); + SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, "timeout_period", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, &ctrlr->timeout_period, 0, ufshci_sysctl_timeout_period, "IU", From nobody Mon Dec 1 09:40:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKf615VnSz6JY4K; Mon, 01 Dec 2025 09:40:41 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKf610Sbnz3ZnM; Mon, 01 Dec 2025 09:40:41 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764582041; 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=M9rst7Hpo1cuKdIVMoZMRUN+VuNRA0SlUZGjdG6eu7M=; b=TXrs/E8cG1x3vCsGdLGf7vwFfBD/+j57WNPC99ONG5Pf3uHgrggF6l6+0PsN1TE71fG67j f6+xLM93fXTyIZ5Yzx8NUbjbOyOza0kA7ZtarZnPOA/vC40OJ4VWhpJwLnqe/SelUCkTeE AZGnV5yBkVATO+DCUfewpcOsTkkRf7/Af7bDmzimoxq7fHgPV2GFz9QooF27ASJwrRo2g2 Ue1tUIQzr+/ubgFi7bMuNd4+19JWBWWZ9BsG79WZIq/lVq8gwozZbOqucz9pduMDt5fpWR du2Bit4QP3ln1icO5sNRXJf+DIbVLL9dlUctac9ucgv4sF6o9qjEWbmgVYS9Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764582041; 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=M9rst7Hpo1cuKdIVMoZMRUN+VuNRA0SlUZGjdG6eu7M=; b=kQqmjoWx1+rofLnlFNUqlW1Xq0WsKdiC9MLNhF3brTVrXhr4TPe/OFUQGGOd0eCXx0uu6z hQ5QzJgW0VpBMCLKh0sMRtkxpY2116eanofgGaXhDE5e3kaWV3FLV/lA76OHg3q83teHpR gdBunoxW9iM8usbDL64YCkEfc9LE+KnJeGb+El2Bj9JMwi235qOpTnuk8Y3B/3Nh5JosG2 CjrKzsbXAInfCtgFKfoa483kB45bpfOj2PSnFO/3O0aWrAQLHT1q+XH8or9yRZvoaw6shI d1CbGPO3ZBM+Vs6UiHvaoKk1ti9CeuYPBPO8yjlbtv33YoGNdxlOqCoKZAlSfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764582041; a=rsa-sha256; cv=none; b=NCyu8eKQa41M7eION6oqQ7c2VSOkjHl3o+I7iR/FQ9PZryn5UmJwjA8a4cKsS+qpUu12+U mGvwvnkhNK/7v2RYAH4rsrQjsZ8oUH9HIijlNXVlRMpMIatpdZsrRGOGUBjGLRfpi+VQk3 +ZkP1LUStmGhSGglGNqfYC6G5m0m0+bAJyI/hxYR/nNONKDor/PT6oNSjDKTVWxGdII3N1 VkFFu/gDKkZ+iv5JX6M090Pee1QRUykTDaMk/mnnvP7eQQrExTwqWaMyEtOah8wPSn6ey3 3mOKcWNYPj2biXi8/+WRYEhn9isQm++d3ykcB2z8k8kM+hsVyVOGWQDO3E+R/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dKf606kJFzhG; Mon, 01 Dec 2025 09:40:40 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 5404F3C01A0; Mon, 01 Dec 2025 09:40:40 +0000 (UTC) Date: Mon, 1 Dec 2025 09:40:40 +0000 From: Brooks Davis To: Dag-Erling Sm??rgrav Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 029a09f18032 - main - sys/_types.h: Actually unbreak gcc build Message-ID: References: <692c1d02.367c7.22c28c58@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <692c1d02.367c7.22c28c58@gitrepo.freebsd.org> On Sun, Nov 30, 2025 at 10:31:30AM +0000, Dag-Erling Sm??rgrav wrote: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=029a09f18032353a9ae874590b879322efc6e53a > > commit 029a09f18032353a9ae874590b879322efc6e53a > Author: Dag-Erling Sm??rgrav > AuthorDate: 2025-11-30 10:30:45 +0000 > Commit: Dag-Erling Sm??rgrav > CommitDate: 2025-11-30 10:31:09 +0000 > > sys/_types.h: Actually unbreak gcc build Thank you for addressing this issue. I'm going to follow up with a different approach that doesn't use __has_feature. It's annoying how recalcitrant GCC has proved about this functionality. -- Brooks From nobody Mon Dec 1 13:24:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKl3y4xttz6JFyC for ; Mon, 01 Dec 2025 13:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKl3y4Sgyz43Rq for ; Mon, 01 Dec 2025 13:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764595454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TJAD5YXM09BUHFpEDHI1eXDw5BQAXi9P72EseLHGV0s=; b=AhJa23QFBQ/cEloPBNqsbNKuHjmnYKxy6jGC3XQ55hdpDtRUcZ3FJrsVKTNOpLe/xYBDeL EUal9L4FfHAaFuvDexOKG7Wor1Xg/j5lHNiDgHmbOknNDDXFcfXC2Y8CrUE+g40x071/Gz t8S6los0UuHSzVEOUqSG2yqgyKA4Leo2uWtreplw4zMVNZ9CFKlVPCwf8J7W/5dRlDYVsZ niB7G9o2mYRTv5fCWfQIuBdPfNqtO3u7B/sgE9q2RYJS2x0PhMYVj9l68jsQv/aT2j1/Ga ZJmDp99TkdH6+BtBx3+nUXXUCmJ0bpJGmyyIa0Cu2aEbf4YqPnzHSbyyDA0Dfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764595454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TJAD5YXM09BUHFpEDHI1eXDw5BQAXi9P72EseLHGV0s=; b=qSb2/LQqFcIoHI5YpjwoJoqOLr3w/73LKh5T0cC9+1J2ziXsfIliG2uenAwXzl2p2e4hPE d5LAbZgexZpY/Y5OtAv135hzu26s/+pfgr8tUVZ/Hn2pDikpbyJ2s3yQEgRlgDrYXZRfWs RZgmJeQbe1qQXkGygd6xma13DQOzIejKf1TVH2hJdkV+IuVDuXPwDH7s2liNa1NN+i4qEB 2AYNwJbK/af6g4/Pz6TCDWG9/04KWW9+PJWOVWGGXN+Bn9BVtvvJVHuu6eEfv/v8sIsHwo fvrf4NED0hsi+2oTL77dOcyQV1ITMy9aeCauWoUt44UkFPE36UHyK0HjPXlwMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764595454; a=rsa-sha256; cv=none; b=I715rbITk8myESWVBkMfB5VScgGG9qpe6TLTmPq5KoNK94tVCGdR+lypddPCDQ1f9xe6+W kaR/51Fd9ZbvBVtD72uhuGMR168xGsU+8v3Q8v6gQpWdBTVjQNFoCTE8pEFU8jahA+KiyX 17LV3WqrvFtYy5YuOdgXK4KA6xCBdWvq/rSViE3mwtLuZ+LvJFP3EPO3f8jCMO60pOdodR y3IUwI7diTTkDYAjN+HJHdAU2KvdEZZQ/ccp3pfHY1ryUmeL/N5bDspDdsey/FNxaSRL+X B5wDd1qKd8FGvJq59m+DE27Wasjd3mA6oOhEneWdSnNTa/8K2Toa+pKL7yvw4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKl3y3wxwz751 for ; Mon, 01 Dec 2025 13:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23644 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 13:24:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: c1e033c33e8b - main - libarchive: merge from vendor branch List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1e033c33e8b290cd40f4069249c879efcbae6a6 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 13:24:14 +0000 Message-Id: <692d96fe.23644.3804dc20@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=c1e033c33e8b290cd40f4069249c879efcbae6a6 commit c1e033c33e8b290cd40f4069249c879efcbae6a6 Merge: 31407551c3d4 bf3359d92128 Author: Martin Matuska AuthorDate: 2025-12-01 13:05:35 +0000 Commit: Martin Matuska CommitDate: 2025-12-01 13:05:35 +0000 libarchive: merge from vendor branch libarchive 3.8.4 Important bugfixes: #2787 bsdtar: Fix zero-length pattern issue #2797 lib: Fix regression introduced in libarchive 3.8.2 when walking enterable but unreadable directories Obtained from: libarchive Vendor commit: d114ceee6de08a7a60ff1209492ba38bf9436f79 MFC after: 1 week contrib/libarchive/NEWS | 8 ++++--- contrib/libarchive/libarchive/archive.h | 4 ++-- contrib/libarchive/libarchive/archive_cryptor.c | 6 +++--- .../libarchive/archive_cryptor_private.h | 4 ++-- contrib/libarchive/libarchive/archive_entry.h | 2 +- .../libarchive/archive_read_disk_entry_from_file.c | 5 ++--- .../libarchive/archive_read_disk_posix.c | 25 ++++++++++------------ .../libarchive/archive_read_support_format_mtree.c | 2 +- .../libarchive/archive_version_details.c | 2 +- contrib/libarchive/libarchive/archive_write.c | 2 +- .../libarchive/archive_write_disk_posix.c | 6 +++--- .../libarchive/archive_write_set_format_xar.c | 12 +++++------ .../test/test_archive_read_multiple_data_objects.c | 2 +- .../libarchive/test/test_write_disk_perms.c | 6 +++--- .../libarchive/test/test_write_filter_bzip2.c | 3 ++- contrib/libarchive/tar/subst.c | 19 ++++++++++------ contrib/libarchive/tar/test/test_option_s.c | 8 ++++++- 17 files changed, 63 insertions(+), 53 deletions(-) From nobody Mon Dec 1 13:56:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKlnC1GvRz6JKV6; Mon, 01 Dec 2025 13:56:31 +0000 (UTC) (envelope-from kp@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKlnC0LW4z46kH; Mon, 01 Dec 2025 13:56:31 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764597391; 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=gj6p7r9C2Gtag3LH1Y3/GJbEQiKPU4bbLRI2Dlrk7Pg=; b=adQ5983hn0Smx3MJbZJjra31Fu+jKfig8AwQfQF5JJhNELAaLWk+wLL1f0MYh6lnbgmK6K FlBZKW6UdvqqdM65JMdjXhuqSFVKag8El8Lb1RCr7gste7GYLJCcu+bepy1iKIauEG96oj 8CVJN1pnIquY1Kkqm5s/KzeipywlqUlbkjmZAajMcXd4mSsTZwS7MeGTob6x9aDr0B3i4O TLme/xM1kaEmRlnrxx6e0F4+223lKhfZ2TJX8l2gnryEp1OLFSf4Bm5vlr5QBlMfb5Vu7U lxBJVi+xnppAqoMy/knYvBo9dKURqpRnzsxOUX8K0p6+jdb5l9Z936TTXb4uPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764597391; 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=gj6p7r9C2Gtag3LH1Y3/GJbEQiKPU4bbLRI2Dlrk7Pg=; b=nP3LYzytV3+0o8UKJ9FNvLaLGebGNORxXCQZueDQJ+eOtAYM0FMWqHbwQKZhRypC0szp4N jJ4732IEogn0D5sYYfevgSZmWwCHzUKhH92CWWPgaSmPzdOV4Eluo993bX+9gZlCBO34zZ +I+xY6NA/ewka2IzqidtLYlOsabDvtdArd9nFmMXLKcgcDZbqroacLCYFMLVtmu+gbxhTP ucPPAuWSNMEC7olRO/gO1qHV8RCxVxYM1r02rqfPsBc7eJ+0ro5AS4cZJbJB8yG1g/ltC3 wj50hJJ9eHnRW6YkqV9PdVdIJmqdbZk7mJwcGYEwwVAf2DacmD326vKO9F8cjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764597391; a=rsa-sha256; cv=none; b=MhACSeWS3nD0CIPxPwJRjuT2C07i9JZKct7Bh7wUNbWLHSRvtoTLcUkV198ErSvBz67I44 3GSBOipQyl0GS52z+qn5Zr8HJTz9S6PIarWoRti4YUgatxkoUWBPwd521Y9vBmlh7oJGSV FVlvP8uOyBU0wKi+CyfVfbixyr1G9uuFMxbovCwBmU2iEwRONpRtBZLJf0fCDzxi3qRKZ2 Qn49PlmILQizVm9Plp4kKWL5roxckaklQOv1oeWHKMIaMUMz0/mkpc6/0/D9am6v8TOI9S WpTU6FpOABWB9X8Wvw/GQnMOs5uSC5RmHd5vTsvZBKdzfAPRko/1hePV8V928w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R12" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dKlnB695Yz6sT; Mon, 01 Dec 2025 13:56:30 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id C8BA916E1A; Mon, 01 Dec 2025 14:56:28 +0100 (CET) From: Kristof Provost To: Robert Clausecker Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2fb8cbc6ef1b - main - libc/tests: add stdbit test framework and unit tests Date: Mon, 01 Dec 2025 14:56:27 +0100 X-Mailer: MailMate (2.0r6272) Message-ID: <3E139664-C0CE-4BB9-9225-66D7D44D644E@FreeBSD.org> In-Reply-To: <692c9966.26e27.70621b5b@gitrepo.freebsd.org> References: <692c9966.26e27.70621b5b@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_2306AE02-65F8-4867-91E7-D602335C7D74_=" --=_MailMate_2306AE02-65F8-4867-91E7-D602335C7D74_= Content-Type: text/plain; charset=UTF-8; format=flowed; markup=markdown Content-Transfer-Encoding: quoted-printable On 30 Nov 2025, at 20:22, Robert Clausecker wrote: > The branch main has been updated by fuz: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D2fb8cbc6ef1b3cc6cd60e5db07f83= 05623f9b044 > > commit 2fb8cbc6ef1b3cc6cd60e5db07f8305623f9b044 > Author: Robert Clausecker > AuthorDate: 2025-11-18 17:33:12 +0000 > Commit: Robert Clausecker > CommitDate: 2025-11-30 19:21:52 +0000 > > libc/tests: add stdbit test framework and unit tests > > This adds unit tests for all 70 functions in . > > I'm sorry for the test framework, but it makes it so I don't > have to write 70 unit tests by hand. > > Reviewed by: adrian, des > Approved by: markj (mentor) > MFC after: 1 month > Differential Revision: https://reviews.freebsd.org/D53660 I=E2=80=99m having issues running the tests now. I get this kyua error doing kyua list in /usr/tests/lib: kyua: E: Load of 'Kyuafile' failed: Failed to load Lua file 'Kyuafile': = Kyuafile:48: Load of 'libc/Kyuafile' failed: Failed to load Lua file = 'libc/Kyuafile': libc/Kyuafile:19: Load of 'libc/stdbit/Kyuafile' = failed: File 'libc/stdbit/Kyuafile' not found. That=E2=80=99s presumably because there=E2=80=99s no Kyuafile (or indeed = anything at = all) in /usr/tests/lib/libc/stdbit. It=E2=80=99s not immediately obvious to me what went wrong to cause that,= but = I=E2=80=99m relatively confident it=E2=80=99s related to this commit. Best regards, Kristof --=_MailMate_2306AE02-65F8-4867-91E7-D602335C7D74_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 30 Nov 2025, at 20:22, Robert Clausecker wrote:

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3D2fb8cbc6ef1b3cc6cd60e5db07f8305623f9b044

commit 2fb8cbc6ef1b3cc6cd60e5db07f8305623f9b044
Author: Robert Clausecker fuz@Free= BSD.org
AuthorDate: 2025-11-18 17:33:12 +0000
Commit: Robert Clausecker fuz@Free= BSD.org
CommitDate: 2025-11-30 19:21:52 +0000

li=
bc/tests: add stdbit test framework and unit tests

This adds unit tests for all 70 functions in <stdbit.h>.

I'm sorry for the test framework, but it makes it so I don't
have to write 70 unit tests by hand.

Reviewed by:    adrian, des
Approved by:    markj (mentor)
MFC after:      1 month
Differential Revision:  https://reviews.freebsd.org/D53660

I=E2=80=99m having issues running the tests now.
I get this kyua error doing kyua list in /usr/tests/lib:

ky=
ua: E: Load of 'Kyuafile' failed: Failed to load Lua file 'Kyuafile': Kyu=
afile:48: Load of 'libc/Kyuafile' failed: Failed to load Lua file 'libc/K=
yuafile': libc/Kyuafile:19: Load of 'libc/stdbit/Kyuafile' failed: File '=
libc/stdbit/Kyuafile' not found.

That=E2=80=99s presumably because there=E2=80=99s no Kyua= file (or indeed anything at all) in /usr/tests/lib/libc/stdbit.

It=E2=80=99s not immediately obvious to me what went wron= g to cause that, but I=E2=80=99m relatively confident it=E2=80=99s relate= d to this commit.

Best regards,
Kristof

--=_MailMate_2306AE02-65F8-4867-91E7-D602335C7D74_=-- From nobody Mon Dec 1 14:04:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKlyZ3DDhz6JbKY for ; Mon, 01 Dec 2025 14:04:38 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 4dKlyZ09mzz47hx for ; Mon, 01 Dec 2025 14:04:38 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-477770019e4so34896345e9.3 for ; Mon, 01 Dec 2025 06:04:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764597876; x=1765202676; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=FX671AXRveIQyNO1+CF4dypugnwDT0bqCYAYd+wUHxU=; b=jbqaT65BIGJeaHTUTy/UFLpJb/vXxDvT/d7zOpyb86xxLMR0cO78oPW1ZwacGnPoYA 6SgXSLQNM0tNd3eHKF401oNSzCtewb+D6OH5uLl11t0jN+zECtB12irJexQhyV9LpJ4m 3FwWJusUnBkxSuXl+YWGYgMX7fIIN6ZZ9Vi/3IlYJhh82JaGsdKF8Xjwq67315TeTGJ9 AdL81T6ytVyl+eTOUfqHhm36L2ViX0nn41EOzVnoDCQghCytRng5zc2LUuzCf/9ecJTm ZmdQZ8hJsO0iTUphoThYC/wfGXjrROvb6eDWJbRM5dXohQhFyROvUwgePIjbA5HDPUXR qFZQ== X-Forwarded-Encrypted: i=1; AJvYcCVPupGWSOTslJtS/41dpa/o2tofaQFbfkSVmDqnpwkN5nlQnEDpkBh6y176lSkCgNLv2Zmt83HG33Uv51izvxFPT2YNkA==@freebsd.org X-Gm-Message-State: AOJu0Yz7IJuduDTL9D193podrlWNNi9TGT0h9P3JYkFr0zykV7CEBMO5 pilKGZuA8DlSKtaiDQMgnl5nsZtKdUn0fEdpHO5LusHyfZA/4HSXqXC1W1GS+U+1ESg= X-Gm-Gg: ASbGncuG+eI/bWr9QD6F+cKt5W1qfeAGwyKrQZiQ8xTIAOlVu5zFApB8g5MXKbA9JOF TD9qOCoIVyJvETVK9D3IqmbjuBgXIyHf8vZwI5IBfOI0V4E/VDpCGheZaRwCN1JeAnr5Ddopf0m lMtf++Un9aoxgTok888d3m0XhnIsLaZOd+DihOmy7QyEx3ASlwVIT4hgeFBu/85F6vrxsQ/TyEp jRP9nbx/dUdNwxWh/mVRalewwOhqs8okuuTXzEx+38NboMhFa6s5rS9k7RIuAfclOl3UAOeuwVh evYvBN3oYMkqCpWoPjO1zZrgu4dwzZ6rZn/mdwhmPOEsIV+ik1gwpbuJ1Vk5cer2K7DsWNyKczE 9BLnItt3RCm4w58PNAoQ7Gxp0jQ7VKXffZuWR4JqWkMWD6J7+CS/lhWz2OPLQmSyL4e0yWDOero pmZqCOOvMus9ptoWCWPeCg7V4cjH9J/74uzY6nSqVVHLVl5LcYBRiF95ud0kf3WSU= X-Google-Smtp-Source: AGHT+IFM4cd3E1TjQmIJZRpXLxeFiWIw2iYAe4cIU1Wh+oQ6wktNl75OxtvysEZ7P1VQyfVd/Qg5IA== X-Received: by 2002:a05:600c:3b11:b0:477:9814:6882 with SMTP id 5b1f17b1804b1-47904aceef6mr226888175e9.5.1764597874984; Mon, 01 Dec 2025 06:04:34 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42e1ca4078csm25926499f8f.29.2025.12.01.06.04.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Dec 2025 06:04:34 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.200.81.1.6\)) Subject: Re: git: 2fb8cbc6ef1b - main - libc/tests: add stdbit test framework and unit tests From: Jessica Clarke In-Reply-To: <3E139664-C0CE-4BB9-9225-66D7D44D644E@FreeBSD.org> Date: Mon, 1 Dec 2025 14:04:22 +0000 Cc: Robert Clausecker , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <6903AA87-20BC-4060-A199-4100FC7CD8EB@freebsd.org> References: <692c9966.26e27.70621b5b@gitrepo.freebsd.org> <3E139664-C0CE-4BB9-9225-66D7D44D644E@FreeBSD.org> To: Kristof Provost X-Mailer: Apple Mail (2.3864.200.81.1.6) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dKlyZ09mzz47hx On 1 Dec 2025, at 13:56, Kristof Provost wrote: >=20 > On 30 Nov 2025, at 20:22, Robert Clausecker wrote: > The branch main has been updated by fuz: > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2fb8cbc6ef1b3cc6cd60e5db07f83056= 23f9b044 > commit 2fb8cbc6ef1b3cc6cd60e5db07f8305623f9b044 > Author: Robert Clausecker fuz@FreeBSD.org > AuthorDate: 2025-11-18 17:33:12 +0000 > Commit: Robert Clausecker fuz@FreeBSD.org > CommitDate: 2025-11-30 19:21:52 +0000 > libc/tests: add stdbit test framework and unit tests >=20 > This adds unit tests for all 70 functions in . >=20 > I'm sorry for the test framework, but it makes it so I don't > have to write 70 unit tests by hand. >=20 > Reviewed by: adrian, des > Approved by: markj (mentor) > MFC after: 1 month > Differential Revision: https://reviews.freebsd.org/D53660 >=20 > I=E2=80=99m having issues running the tests now. > I get this kyua error doing kyua list in /usr/tests/lib: > kyua: E: Load of 'Kyuafile' failed: Failed to load Lua file = 'Kyuafile': Kyuafile:48: Load of 'libc/Kyuafile' failed: Failed to load = Lua file 'libc/Kyuafile': libc/Kyuafile:19: Load of = 'libc/stdbit/Kyuafile' failed: File 'libc/stdbit/Kyuafile' not found. >=20 > That=E2=80=99s presumably because there=E2=80=99s no Kyuafile (or = indeed anything at all) in /usr/tests/lib/libc/stdbit. > It=E2=80=99s not immediately obvious to me what went wrong to cause = that, but I=E2=80=99m relatively confident it=E2=80=99s related to this = commit. > Best regards, > Kristof Because TESTSDIR is /usr/tests/lib/libc/tests/stdbit thanks to the location of libc=E2=80=99s tests in the src tree. That=E2=80=99s meant = to be overridden for every subdirectory, whether by including ../Makefile.netbsd-tests, in the case of all the NetBSD-imported ones, or by manually overriding it, such as in lib/libc/tests/iconv/Makefile. It would've been nice to test these tests prior to commit. Was that not done? Jessica From nobody Mon Dec 1 14:10:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKm572hdRz6JbXy for ; Mon, 01 Dec 2025 14:10: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKm571xB9z49kq for ; Mon, 01 Dec 2025 14:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=od04JcwcXJDvV164xGkSf9sHnpUOjXALtxWWaudbAyg=; b=VpB9oKEruW73d7qoSN0usF+KRomG6jXPYqg0SVd5oEMN7nf9ojF5JxXl1uBijgBsl2eCGQ dqozUswnONEZal/mtKF9pd/o059GFODhW18ZhWtnAfU6d1uWb8hgQlJrKSi7Sl/1Azo4eS MeOg8xAj2znBfKJko2ewAobjqz/kj3Kyh91w9v2vrIlMrnaTeEGH0H0WMntRQw/xC14Lef GNhzibu7JXFAPp5LBsUI5JMHT6xOGVKvn+q8cn7zuuWYAft/Il1/t6BRutFDl0+pAUPscT t9tF2knq8OVuXF2ISJh9z3zt7EWqHaTDjJhaxFSpJsus2LG1aBnpaGdaeqWvRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=od04JcwcXJDvV164xGkSf9sHnpUOjXALtxWWaudbAyg=; b=lnG/A2D2cEpBaR1sqPnZ4D7IMwUTHur4vsMndIl2IZGq/V2t8dfV7WgLXSna9auYOh4NmO LZL+49IzsMxEf/XgebdijJwRavqvkdpyDYILfPeVZqmjTfE7S50OH4KZLObJa8SPU3FUFo TGl3gBwkl+zkK875bnTqITirfu/owfh3lQ2HV0JP+UEVg9FTEUxInzT8lo/jyHeh2yrqw8 ILxj3YcrR7Ji6iVM1XEbmGX3Q4aMm/0KhI7knGejjecyTCOvzQ3woe/geF1zhS3YCSOJv+ HwY3IcdTSGEmIQlfD309g2sdcP8FJhm32F5yhXQ5A6vbJ2y6k7L2sL8Rg5/Gbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764598219; a=rsa-sha256; cv=none; b=cgNoURJoWZh2XpwGKdfgAiPqwGdTMRP9m7RvnkRj5DqACYiyHmP2g/7zvP/Sv+B4lDHm46 /kzcuhO4/3rG5I52O27TE2c8r2vOs6luQcW4VC95RGgbHZp1hqo7MhPE+we7swtit/Pw29 f+AC14QwCzhq1h66TC9GtFit6g8iGOxnIHMVrKzl5aHe/p8ni6jKNujyBdGdO/bLgP0gyq vHGkxWrfk+QLE9atoPL5H581S7ACoXDTXKGTEel7IQ6jl56GQ+wO6Krqr72sbhHqSsyfCm Q88PqPjJKiJS7joMALnbiB9u2vHbMo0EPbdGLAZt5ZTNmvx1c/MBncvo9E4BdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKm571X0zz81q for ; Mon, 01 Dec 2025 14:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 289b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 14:10:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 5f529f9e292a - main - libc: Fix TESTSDIR for new stdbit tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f529f9e292a30c065c316ed5fd0d23e07b26e5c Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 14:10:14 +0000 Message-Id: <692da1c6.289b3.56e4faf@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5f529f9e292a30c065c316ed5fd0d23e07b26e5c commit 5f529f9e292a30c065c316ed5fd0d23e07b26e5c Author: Jessica Clarke AuthorDate: 2025-12-01 14:06:21 +0000 Commit: Jessica Clarke CommitDate: 2025-12-01 14:06:21 +0000 libc: Fix TESTSDIR for new stdbit tests Otherwise the directory created by etc/mtree/BSD.tests.dist, which is where these belong, and referred to by the generated Kyuafile for /usr/tests/lib/libc (via stdbit's existence in TESTS_SUBDIRS), ends up empty with no Kyuafile, which is an error for kyua. Reported by: kp Fixes: 2fb8cbc6ef1b ("libc/tests: add stdbit test framework and unit tests") --- lib/libc/tests/stdbit/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/tests/stdbit/Makefile b/lib/libc/tests/stdbit/Makefile index 37450056007a..8dbc86528de3 100644 --- a/lib/libc/tests/stdbit/Makefile +++ b/lib/libc/tests/stdbit/Makefile @@ -1,3 +1,5 @@ +TESTSDIR= ${TESTSBASE}/lib/libc/stdbit + # ensure libc functions are tested, not clang's builtins CFLAGS+= -fno-builtin From nobody Mon Dec 1 14:13:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKm9400DHz6Jbff; Mon, 01 Dec 2025 14:13:43 +0000 (UTC) (envelope-from kp@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKm936QXdz3BvY; Mon, 01 Dec 2025 14:13:43 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598423; 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=baWGx0PGbGFBBIdyI94kUxAOFYXiUMV77G/U3bljkLg=; b=QkLuXZu1W9z1P4U7NJzClpuptPJElcLOPmlRu0VFd+GALFPukTKMd40Qq03BVFB+Kg08fZ 0KBMPVNPmjFBKCNr74kglUA+0f38wSuKf2OFJSCAMQB/qcvoR3vLl2QM+kz9Zsakkz3RJ0 pt3tzJa1S4BJsNsgcqYWJcE8p4L7JA4iHh0hXK/NQJmvrkhsLVJqLyNOilgKAhRfSzCNFu S3HnJBZ7XNBiM3xU4w27zAqxBUnLGUVmsu2NR2Rqph0S3Jltk27xLkhicLOs+792yK1oB5 eiTyB21Br+ab3e/e/57UUUqOH5LyfAAUr2qpXZ6swxtyQNu9hGMUHrBAybRLOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598423; 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=baWGx0PGbGFBBIdyI94kUxAOFYXiUMV77G/U3bljkLg=; b=tkyMrP0PpCekYYcO6MMWLCbCZrZiL+aswQJtF/jcFSTciyXc/mJMCGMZkqJ8tWEZ+PJ/Uy YjMD5olZYd4v1UbYQ/gBOwHcUl9rfEVumVDi9hvGOqDans/fv1wYwKGJiVqLfLPnQbQm9r lkARHhmrsa0H5DBd2ZFWrLC2LPesKXAsCI8D4AupLPABEnTGAXMMBGtAbPJ643MT5ErBNb lgjV5/nd6ooZiHg/m/+slzjG6D7uiYsJhFfZH64HH/ZEhvn/8wItMphHND1jkNAMJNmqn6 jD7ZDBAwM8fhIRFO4K0CvQp393nfrR17r/WT3NmPr62+ShqX0MKGysrLXWjVWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764598423; a=rsa-sha256; cv=none; b=PIskI0QxWhx41z/SDMFMndHppvJC/SP6lzScGCk2Y7Zx5d9VNpxLDbktIw2XRp9j18evjC /dj7Ug+5FWYq+0OPbCFRn8ER85rUsqK/Wrl/B6EpkzTUw8GeTeEH1F/9kl/6kJHaWgUDah mtnVBED/iTD8/O//8oPaqq2Kl0a6+dqMKOUUz1wNJ5MSEiRhDwfnjtQ9nWuIpYeZBFzN+h 1bczTtjZlHpoLKkdVHFRE+s2h4K3XhGc5pJegk68PDuxiwtkVcwqMzj3LV3v5veMVIItzi GaVrwSQDnaP6JU3CMLo+iKXcZjz25YLbnw3YNYia2t0vKgkRgTzLsyTjEmbbnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R12" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dKm93523Nz78G; Mon, 01 Dec 2025 14:13:43 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id AD4E616D64; Mon, 01 Dec 2025 15:13:41 +0100 (CET) From: Kristof Provost To: Jessica Clarke Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 5f529f9e292a - main - libc: Fix TESTSDIR for new stdbit tests Date: Mon, 01 Dec 2025 15:13:41 +0100 X-Mailer: MailMate (2.0r6272) Message-ID: In-Reply-To: <692da1c6.289b3.56e4faf@gitrepo.freebsd.org> References: <692da1c6.289b3.56e4faf@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_99BE4D1D-1FBF-4E93-8962-90AE8046886B_=" --=_MailMate_99BE4D1D-1FBF-4E93-8962-90AE8046886B_= Content-Type: text/plain; format=flowed; markup=markdown Content-Transfer-Encoding: quoted-printable Thanks! On 1 Dec 2025, at 15:10, Jessica Clarke wrote: > The branch main has been updated by jrtc27: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3D5f529f9e292a30c065c316ed5fd0d= 23e07b26e5c > > commit 5f529f9e292a30c065c316ed5fd0d23e07b26e5c > Author: Jessica Clarke > AuthorDate: 2025-12-01 14:06:21 +0000 > Commit: Jessica Clarke > CommitDate: 2025-12-01 14:06:21 +0000 > > libc: Fix TESTSDIR for new stdbit tests > > Otherwise the directory created by etc/mtree/BSD.tests.dist, which = > is > where these belong, and referred to by the generated Kyuafile for > /usr/tests/lib/libc (via stdbit's existence in TESTS_SUBDIRS), = > ends up > empty with no Kyuafile, which is an error for kyua. > > Reported by: kp > Fixes: 2fb8cbc6ef1b ("libc/tests: add stdbit test = > framework and unit tests") > --- > lib/libc/tests/stdbit/Makefile | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/lib/libc/tests/stdbit/Makefile = > b/lib/libc/tests/stdbit/Makefile > index 37450056007a..8dbc86528de3 100644 > --- a/lib/libc/tests/stdbit/Makefile > +++ b/lib/libc/tests/stdbit/Makefile > @@ -1,3 +1,5 @@ > +TESTSDIR=3D ${TESTSBASE}/lib/libc/stdbit > + > # ensure libc functions are tested, not clang's builtins > CFLAGS+=3D -fno-builtin --=_MailMate_99BE4D1D-1FBF-4E93-8962-90AE8046886B_= Content-Type: text/html Content-Transfer-Encoding: quoted-printable

Thanks!

On 1 Dec 2025, at 15:10, Jessica Clarke wrote:

The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3D5f529f9e292a30c065c316ed5fd0d23e07b26e5c

commit 5f529f9e292a30c065c316ed5fd0d23e07b26e5c
Author: Jessica Clarke jrtc27@F= reeBSD.org
AuthorDate: 2025-12-01 14:06:21 +0000
Commit: Jessica Clarke jrtc27@F= reeBSD.org
CommitDate: 2025-12-01 14:06:21 +0000

li=
bc: Fix TESTSDIR for new stdbit tests

Otherwise the directory created by etc/mtree/BSD.tests.dist, which is
where these belong, and referred to by the generated Kyuafile for
/usr/tests/lib/libc (via stdbit's existence in TESTS_SUBDIRS), ends up
empty with no Kyuafile, which is an error for kyua.

Reported by:    kp
Fixes:          2fb8cbc6ef1b ("libc/tests: add stdbit test framework=
 and unit tests")

lib/libc/tests/stdbit/Makefile | 2 ++
1 file changed, 2 insertions(+)

diff --git a/lib/libc/tests/stdbit/Makefile b/lib/libc/te= sts/stdbit/Makefile
index 37450056007a..8dbc86528de3 100644
--- a/lib/libc/tests/stdbit/Makefile
+++ b/lib/libc/tests/stdbit/Makefile
@@ -1,3 +1,5 @@
+TESTSDIR=3D ${TESTSBASE}/lib/libc/stdbit
+

ensure libc functions are tested, not clang's builtins

CFLAGS+=3D -fno-builtin

--=_MailMate_99BE4D1D-1FBF-4E93-8962-90AE8046886B_=-- From nobody Mon Dec 1 14:21:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKV5w8Lz6JcYm for ; Mon, 01 Dec 2025 14:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKmKV5N23z3Dl0 for ; Mon, 01 Dec 2025 14:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBFmNcpCgcbFf95DQslRylXejeG+g2LX39TlLOgm5HM=; b=IBE58tlWnlhmJwXCvAPk/VcPfjWrOq7ndH3yueHl6OF1hdhdfqywjTTTJvsrahpIvOs/IG rCugEkig9ycwtA3gNdf2CGgLZNAqHo8H8ZV5c4Jj7DRpBZfwRADw2+NjZwUKCCg/bnoniS w6XUNfAdnLU4j1EAEGr05BqNGLRzocwnf7kj9e0xP9AJoGnNduciCDyoRMnDn7va5KG6ui CdLBpZMf+2bGKichQwB0BLOazCqwIDLKUq5MotrbltzXVYsjIDrlgGrjbbp3JEwdWA4VAS 65zSKSqU226Ad5GkX9d1TZCYaWrorCiF3n1PA+QfF2mFLn1ykzqG3vKLCP+stQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBFmNcpCgcbFf95DQslRylXejeG+g2LX39TlLOgm5HM=; b=AqDmdZBVQ/pLFhSZs/G5QavUmoqaV2PXTeGBxd/64kNpmN77uBkyZpVjEp09KIu81AHJsb l5YZUDFoBUnsK8oj59SLa/94lNrexYOp2GhqgP9AkvxRGV/u2D/A2xOB+1w+oQtBNpu1cC IsI1vq5SvxJDfCE/XCnBHdfZHM9LT+KnYNEj2CwIPEfGGnOA7nu9VADbuPQPzWt8Is7j1q oAVzBmclISsexTcckyvb5ilQfbkPKOx7JOCjIamUYyAKhxUqKCbi0EFe7w2cpOJlSnDDKv elA8mWAFzUbZ4Yz/MUhwAk2kl82Sut8/91i5ciH3WIele0GiUaAebitr5IWflg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764598862; a=rsa-sha256; cv=none; b=K3cN9qH4rqCMarcoR+0RKmRFauYYtV8pZzveeAOjDZFrVcvybqYDw3xXENtO/epnYT4XQ8 CRH8BTzA519PY8eNnbVDoBsJvXCUVTPPf8Apt2joYEzZMNNF0gK/j2NyczcdDamYFrh51G EuX5jRctDlOidJGiUUivVgOM6vOBbURdt9uPJebFTmcW5uNhBJBEnyl+uFjrR4D6BrVaAu zu2L44iN2KJO+89wznXZw8gwTumZdHesdD+1PwT2MRteWoVSndXmfXodio4T7NDix3hlt0 lgO+mKy8HZASMvBOQpTxT7RiXs6bg1cT3PZIX0ixEMPv8v73w6nfDyjFY4/4Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKV4yCFz82P for ; Mon, 01 Dec 2025 14:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ab04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 14:21:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 72b114169bd5 - main - linker: Avoid invoking eventhandlers on incompletely loaded files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72b114169bd56ec157d746a2df87b3a4617065b3 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 14:21:02 +0000 Message-Id: <692da44e.2ab04.29ad736b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=72b114169bd56ec157d746a2df87b3a4617065b3 commit 72b114169bd56ec157d746a2df87b3a4617065b3 Author: Mark Johnston AuthorDate: 2025-11-26 18:15:48 +0000 Commit: Mark Johnston CommitDate: 2025-12-01 14:19:18 +0000 linker: Avoid invoking eventhandlers on incompletely loaded files We do not invoke the kld_load eventhandler until after the file is fully linked, so don't invoke the kld_unload_try or kld_unload event handlers unless the file is fully linked either. In my case, the dtrace SDT kld_unload_try handler was running before relocations were processed against the file, and that caused problems when sdt_kld_unload_probes() accesses elements of a linker set. Move the kld_unload handler invocation earlier, to after sysuninits have been run. This is a bit more consistent with the kld_load handler. PR: 291238 Reviewed by: imp, emaste, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53938 --- sys/kern/kern_linker.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index e2f63cbc0c5a..9559b5233a3e 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -703,9 +703,11 @@ linker_file_unload(linker_file_t file, int flags) /* Give eventhandlers a chance to prevent the unload. */ error = 0; - EVENTHANDLER_INVOKE(kld_unload_try, file, &error); - if (error != 0) - return (EBUSY); + if ((file->flags & LINKER_FILE_LINKED) != 0) { + EVENTHANDLER_INVOKE(kld_unload_try, file, &error); + if (error != 0) + return (EBUSY); + } KLD_DPF(FILE, ("linker_file_unload: file is unloading," " informing modules\n")); @@ -768,10 +770,12 @@ linker_file_unload(linker_file_t file, int flags) * Don't try to run SYSUNINITs if we are unloaded due to a * link error. */ - if (file->flags & LINKER_FILE_LINKED) { + if ((file->flags & LINKER_FILE_LINKED) != 0) { file->flags &= ~LINKER_FILE_LINKED; linker_file_unregister_sysctls(file); linker_file_sysuninit(file); + EVENTHANDLER_INVOKE(kld_unload, file->filename, file->address, + file->size); } TAILQ_REMOVE(&linker_files, file, link); @@ -788,9 +792,6 @@ linker_file_unload(linker_file_t file, int flags) LINKER_UNLOAD(file); - EVENTHANDLER_INVOKE(kld_unload, file->filename, file->address, - file->size); - if (file->filename) { free(file->filename, M_LINKER); file->filename = NULL; From nobody Mon Dec 1 14:21:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKX1M8bz6JcYn for ; Mon, 01 Dec 2025 14:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKmKW6BWhz3Dhc for ; Mon, 01 Dec 2025 14:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvXwDu/TTGsQWsEuJXRToOWanl41s/MuxsNSsNuVzjQ=; b=CBw6XE31W4Al3h+vrRdoxxVGlXurO/dTSWqHUA1inHss0Xos419QxtdeDudbibbKVlPxbX su64d7+NUJU+5VGqnLdeRS/KxIlkMaCnbMU+m/W5tzK/AZfbCSqL0KPL15iYYOZHR7RI+u o5YO3BHQfYbNMzOXdLo/H6EkqqwluRu/NVRWZvX9UIFduw0kACq84YLTBtdcoh3TMKwLsj 6L3cxW6BXAS1uNNpF7gC5FHt9MYKro2SSwFTdZeHJUY3yx3Lx+ZFJc+2aTL6SwERa1HpWj S5vyTscpHVQMjALJCa+aTwPVWpNK88fI2/z5Oxw5ff1+ROzr8Can4uVVYxbyyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vvXwDu/TTGsQWsEuJXRToOWanl41s/MuxsNSsNuVzjQ=; b=qYVmE4KKubS16ejRsFVC1r94fWBgRAG5TRj4YRsDShRPlhaqnEsG8Kql7zyQR1/MMtQ/m/ kEsIgBzWh3rICvy0JdRlMpBPV5NAL8n6a9FiJmQaUvpNY6YOu+uXo8uSrj8E13GO7G6byM +70S8bSo4OSYan9nWun1jEH/DVP8E6uxv88EHVlPMHocU7SKy9fV0aK2jI0/7VRLxAfHc1 +reGtwDmdh2gyDSnJqKiFgkh6XPqPQb3qSlpzBTK7YJ2NMEQLcN2bvEX6l9MIwQ1ae65kh WTevnMM/iscCMZBJlNcSEfTXv2g8VCdEg5Byo3XTbb38Seh/s0ONYv8yyTK7mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764598863; a=rsa-sha256; cv=none; b=Q1c4+JS48YK755JTjxV7qgLE01TfDlzH7dLXW4Je12VT+X4CR8RCKvk8KNfeSSiqvuZ2lO GL5WGXQW2mXX8ILwV6xHAc/X+wMEwTm/aBmuX9MRpUAbf2rmBXfaAO6MGPzmN+XNp0d3cs ztcoKfN2CHSjjJ0CRXDlkCP+72u+5jCI/CMnOXQ0A3gctQ/SlL7/J/yIshSuw2EXq6k7TM 4zURF5Zk0pPy2xYheCUGsBXB+C8RrVebGU0xPl00YzfE+SU/TfJId9wLShXuPJGaiBgHRU yNEGPOlDI3MNTIUNOvltarAdTbTQ0vxySiGEloJuLOfR5OvSsTk2FHkjEX1hTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKW5lRQz8gg for ; Mon, 01 Dec 2025 14:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 294b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 14:21:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo From: Mark Johnston Subject: git: d667cc77ba20 - main - dtrace: remove sparc tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d667cc77ba20082c16457ef4ae7f3060d9ab70b1 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 14:21:03 +0000 Message-Id: <692da44f.294b7.587af8c1@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d667cc77ba20082c16457ef4ae7f3060d9ab70b1 commit d667cc77ba20082c16457ef4ae7f3060d9ab70b1 Author: Minsoo Choo AuthorDate: 2025-11-29 19:02:42 +0000 Commit: Mark Johnston CommitDate: 2025-12-01 14:19:18 +0000 dtrace: remove sparc tests Signed-off-by: Minsoo Choo Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1907 --- .../dtrace/test/tst/sparc/arrays/tst.uregsarray.d | 85 ------------- .../tst/sparc/pid/err.D_PROC_ALIGN.misaligned.d | 40 ------- .../tst/sparc/pid/err.D_PROC_ALIGN.misaligned.exe | 29 ----- .../cmd/dtrace/test/tst/sparc/pid/tst.br.d | 70 ----------- .../cmd/dtrace/test/tst/sparc/pid/tst.br.d.out | 23 ---- .../cmd/dtrace/test/tst/sparc/pid/tst.br.s | 81 ------------- .../cmd/dtrace/test/tst/sparc/pid/tst.branch.d | 78 ------------ .../cmd/dtrace/test/tst/sparc/pid/tst.branch.s | 63 ---------- .../cmd/dtrace/test/tst/sparc/pid/tst.embedded.d | 73 ------------ .../cmd/dtrace/test/tst/sparc/pid/tst.embedded.s | 59 --------- .../dtrace/test/tst/sparc/usdt/tst.tailcall.ksh | 132 --------------------- .../test/tst/sparc/ustack/annotated_helper.d | 32 ----- .../dtrace/test/tst/sparc/ustack/helper_helper.d | 32 ----- .../dtrace/test/tst/sparc/ustack/tst.annotated.c | 43 ------- .../dtrace/test/tst/sparc/ustack/tst.annotated.d | 35 ------ .../test/tst/sparc/ustack/tst.annotated.d.out | 4 - .../dtrace/test/tst/sparc/ustack/tst.circstack.d | 46 ------- .../dtrace/test/tst/sparc/ustack/tst.circstack.s | 44 ------- .../cmd/dtrace/test/tst/sparc/ustack/tst.helper.c | 81 ------------- .../cmd/dtrace/test/tst/sparc/ustack/tst.helper.d | 44 ------- .../dtrace/test/tst/sparc/ustack/tst.helper.d.out | 4 - .../dtrace/test/tst/sparc/ustack/tst.trapstat.ksh | 87 -------------- 22 files changed, 1185 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/arrays/tst.uregsarray.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/arrays/tst.uregsarray.d deleted file mode 100644 index 3ef38983ad52..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/arrays/tst.uregsarray.d +++ /dev/null @@ -1,85 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - - -#pragma ident "%Z%%M% %I% %E% SMI" - - -/* - * ASSERTION: - * Positive test to make sure that we can invoke sparc - * ureg[] aliases. - * - * SECTION: User Process Tracing/uregs Array - * - * NOTES: This test does no verification - the value of the output - * is not deterministic. - */ - -#pragma D option quiet - -BEGIN -{ - printf("R_G0 = 0x%x\n", uregs[R_G0]); - printf("R_G1 = 0x%x\n", uregs[R_G1]); - printf("R_G2 = 0x%x\n", uregs[R_G2]); - printf("R_G3 = 0x%x\n", uregs[R_G3]); - printf("R_G4 = 0x%x\n", uregs[R_G4]); - printf("R_G5 = 0x%x\n", uregs[R_G5]); - printf("R_G6 = 0x%x\n", uregs[R_G6]); - printf("R_G7 = 0x%x\n", uregs[R_G7]); - printf("R_O0 = 0x%x\n", uregs[R_O0]); - printf("R_O1 = 0x%x\n", uregs[R_O1]); - printf("R_O2 = 0x%x\n", uregs[R_O2]); - printf("R_O3 = 0x%x\n", uregs[R_O3]); - printf("R_O4 = 0x%x\n", uregs[R_O4]); - printf("R_O5 = 0x%x\n", uregs[R_O5]); - printf("R_O6 = 0x%x\n", uregs[R_O6]); - printf("R_O7 = 0x%x\n", uregs[R_O7]); - printf("R_L0 = 0x%x\n", uregs[R_L0]); - printf("R_L1 = 0x%x\n", uregs[R_L1]); - printf("R_L2 = 0x%x\n", uregs[R_L2]); - printf("R_L3 = 0x%x\n", uregs[R_L3]); - printf("R_L4 = 0x%x\n", uregs[R_L4]); - printf("R_L5 = 0x%x\n", uregs[R_L5]); - printf("R_L6 = 0x%x\n", uregs[R_L6]); - printf("R_L7 = 0x%x\n", uregs[R_L7]); - printf("R_I0 = 0x%x\n", uregs[R_I0]); - printf("R_I1 = 0x%x\n", uregs[R_I1]); - printf("R_I2 = 0x%x\n", uregs[R_I2]); - printf("R_I3 = 0x%x\n", uregs[R_I3]); - printf("R_I4 = 0x%x\n", uregs[R_I4]); - printf("R_I5 = 0x%x\n", uregs[R_I5]); - printf("R_I6 = 0x%x\n", uregs[R_I6]); - printf("R_I7 = 0x%x\n", uregs[R_I7]); - printf("R_CCR = 0x%x\n", uregs[R_CCR]); - printf("R_PC = 0x%x\n", uregs[R_PC]); - printf("R_NPC = 0x%x\n", uregs[R_NPC]); - printf("R_Y = 0x%x\n", uregs[R_Y]); - printf("R_ASI = 0x%x\n", uregs[R_ASI]); - printf("R_FPRS = 0x%x\n", uregs[R_FPRS]); - exit(0); -} diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/err.D_PROC_ALIGN.misaligned.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/err.D_PROC_ALIGN.misaligned.d deleted file mode 100644 index 3e4662740816..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/err.D_PROC_ALIGN.misaligned.d +++ /dev/null @@ -1,40 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * ASSERTION: On SPARC, you can't trace misaligned offsets - * - * SECTION: User Process Tracing/pid Provider - * - * NOTES: - * - */ - -pid$1:a.out:main:7 -{ -} diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/err.D_PROC_ALIGN.misaligned.exe b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/err.D_PROC_ALIGN.misaligned.exe deleted file mode 100644 index 595db1de33da..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/err.D_PROC_ALIGN.misaligned.exe +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/ksh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" - -sleep 1000000 diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.d deleted file mode 100644 index cf1dc02ec47c..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.d +++ /dev/null @@ -1,70 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * ASSERTION: Trace all instructions in the function 'test' to verify that - * the branches are emulated correctly. - */ - -#pragma D option destructive -#pragma D option quiet - -pid$1:a.out:waiting:entry -{ - this->a = (char *)alloca(1); - *this->a = 1; - copyout(this->a, arg0, 1); -} - -pid$1:a.out:test: -{ - printf("%s:%s\n", probefunc, probename); -} - -syscall::rexit:entry -/pid == $1/ -{ - exit(0); -} - - -BEGIN -{ - /* - * Let's just do this for 5 seconds. - */ - timeout = timestamp + 5000000000; -} - -profile:::tick-4 -/timestamp > timeout/ -{ - trace("test timed out"); - exit(1); -} - diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.d.out deleted file mode 100644 index 8559271e4aac..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.d.out +++ /dev/null @@ -1,23 +0,0 @@ -test:entry -test:0 -test:4 -test:8 -test:c -test:10 -test:14 -test:18 -test:1c -test:20 -test:24 -test:28 -test:2c -test:30 -test:34 -test:38 -test:3c -test:40 -test:44 -test:48 -test:4c -test:return - diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.s b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.s deleted file mode 100644 index dfa7d27074f2..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.br.s +++ /dev/null @@ -1,81 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include - - DGDEF(__fsr_init_value) - .word 0 - - ENTRY(waiting) - retl - ldub [%o0], %o0 - SET_SIZE(waiting) - - ENTRY(test) - mov 1, %g1 - - brz %g1, 1f - nop - brlez %g1, 1f - nop - brlz %g0, 1f - nop - brlz %g1, 1f - nop - brnz %g0, 1f - sub %g0, 2, %g1 - brgz %g1, 1f - nop - brgz %g0, 1f - nop - brgez %g1, 1f - nop - - mov %g1, %o0 - -1: - retl - nop - SET_SIZE(test) - - ENTRY(main) - save %sp, -SA(MINFRAME + 4), %sp - stb %g0, [%fp - 4] -1: - call waiting - sub %fp, 4, %o0 - tst %o0 - bz 1b - nop - - call test - nop - - ret - restore %g0, %g0, %o0 - SET_SIZE(main) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.branch.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.branch.d deleted file mode 100644 index cfcf0a715d1a..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.branch.d +++ /dev/null @@ -1,78 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * ASSERTION: - * - * SECTION: - * - * NOTES: - * - */ - -#pragma D option destructive - -pid$1:a.out:waiting:entry -{ - this->a = (char *)alloca(1); - *this->a = 1; - copyout(this->a, arg0, 1); -} - -pid$1:a.out:main:, -pid$1:a.out:other: -{ -} - -pid$1:a.out:bad:entry -{ - exit(1); -} - -syscall::rexit:entry -/pid == $1/ -{ - exit(0); -} - - -BEGIN -{ - /* - * Let's just do this for 5 seconds. - */ - timeout = timestamp + 5000000000; -} - -profile:::tick-4 -/timestamp > timeout/ -{ - trace("test timed out"); - exit(1); -} - diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.branch.s b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.branch.s deleted file mode 100644 index 3e6531f32190..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.branch.s +++ /dev/null @@ -1,63 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include - - DGDEF(__fsr_init_value) - .word 0 - - ENTRY(waiting) - retl - ldub [%o0], %o0 - SET_SIZE(waiting) - - ENTRY(main) - save %sp, -SA(MINFRAME + 4), %sp - stb %g0, [%fp - 4] -1: - call waiting - sub %fp, 4, %o0 - tst %o0 - bz 1b - nop - - restore - - tst %g0 - be other - nop - - ALTENTRY(bad) - illtrap - SET_SIZE(bad) - SET_SIZE(main) - - ENTRY(other) - retl - clr %o0 - SET_SIZE(other) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.embedded.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.embedded.d deleted file mode 100644 index c484c3f0c721..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.embedded.d +++ /dev/null @@ -1,73 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * ASSERTION: - * - * SECTION: - * - * NOTES: - * - */ - -#pragma D option destructive - -pid$1:a.out:waiting:entry -{ - this->a = (char *)alloca(1); - *this->a = 1; - copyout(this->a, arg0, 1); -} - -pid$1:a.out:main:, -pid$1:a.out:inner: -{ -} - -syscall::rexit:entry -/pid == $1/ -{ - exit(0); -} - - -BEGIN -{ - /* - * Let's just do this for 5 seconds. - */ - timeout = timestamp + 5000000000; -} - -profile:::tick-4 -/timestamp > timeout/ -{ - trace("test timed out"); - exit(1); -} - diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.embedded.s b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.embedded.s deleted file mode 100644 index 612f0b926142..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/tst.embedded.s +++ /dev/null @@ -1,59 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include - - DGDEF(__fsr_init_value) - .word 0 - - ENTRY(waiting) - retl - ldub [%o0], %o0 - SET_SIZE(waiting) - - ENTRY(main) - save %sp, -SA(MINFRAME + 4), %sp - stb %g0, [%fp - 4] -1: - call waiting - sub %fp, 4, %o0 - tst %o0 - bz 1b - nop - - restore - - ALTENTRY(inner) - nop - nop - nop - SET_SIZE(inner) - - retl - clr %o0 - SET_SIZE(main) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/usdt/tst.tailcall.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/usdt/tst.tailcall.ksh deleted file mode 100644 index c3651ecf7eb4..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/usdt/tst.tailcall.ksh +++ /dev/null @@ -1,132 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" - -# -# ASSERTION: Make sure USDT probes work as tail-calls on SPARC. -# - -if [ $# != 1 ]; then - echo expected one argument: '<'dtrace-path'>' - exit 2 -fi - -dtrace=$1 -DIR=/var/tmp/dtest.$$ - -mkdir $DIR -cd $DIR - -cat > test.s < - - DGDEF(__fsr_init_value) - .word 0 - - ENTRY(test) - save %sp, -SA(MINFRAME + 4), %sp - mov 9, %i0 - mov 19, %i1 - mov 2006, %i2 - call __dtrace_test___fire - restore - SET_SIZE(test) - - ENTRY(main) - save %sp, -SA(MINFRAME + 4), %sp - -1: - call test - nop - - ba 1b - nop - - ret - restore %g0, %g0, %o0 - SET_SIZE(main) -EOF - -cat > prov.d < timeout/ -{ - trace("test timed out"); - exit(1); -} -EOF - -status=$? - -cd / -/bin/rm -rf $DIR - -exit $status diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/annotated_helper.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/annotated_helper.d deleted file mode 100644 index 3577f86f8ee6..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/annotated_helper.d +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#ident "%Z%%M% %I% %E% SMI" - -dtrace:helper:ustack: -{ - "@it's annotated" -} diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/helper_helper.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/helper_helper.d deleted file mode 100644 index 8abc47d006dc..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/helper_helper.d +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -dtrace:helper:ustack: -{ - "" -} diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/tst.annotated.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/tst.annotated.c deleted file mode 100644 index 8cdf8abad5af..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/tst.annotated.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -int -baz(void) -{ - return (8); -} - -int -main(int argc, char **argv) -{ - for (;;) { - baz(); - } - - return (0); -} diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/tst.annotated.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/tst.annotated.d deleted file mode 100644 index dd795bece03f..000000000000 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/ustack/tst.annotated.d +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. *** 373 LINES SKIPPED *** From nobody Mon Dec 1 14:21:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKY4mPrz6JcW8 for ; Mon, 01 Dec 2025 14:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKmKY1G7cz3DfY for ; Mon, 01 Dec 2025 14:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OIQSvtaiBQQGdbwBllcnfrsHkuRDkK2CpsiNIjMqUi0=; b=wMQQn+p4Og9EUoaLEZm77eDWBQkJs6XFzECJuUpxXhFDB2qOlokQtGS/q1XFI7eQOhifY8 8BsnzznekNMQdGFE2Y5kp7pXiLB6izimJgbI3KT7x4eBY06y3KE82znWqfxxSeTR+T6iwF bJzcsRQAqoxf/hsCzaYZNDUtWpwLw4929fIHOVc0ZgD6GA4+VT6osocDFaC3x9VoJ0j5RN TsqQfRmd8RQcU0iUNe3iCjZSxa/GqP2GbeZjlFtoo21pgaL52mvqOuq6nA47b1nM9Cnwvf eVj5ewAujn+c7Y1BVH40Ju8x18flOl3vLGySL+s9oaEYn8EtPha2QQUrYFyzTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OIQSvtaiBQQGdbwBllcnfrsHkuRDkK2CpsiNIjMqUi0=; b=TApJSluDGySUfPu9p197Z55DqfXvissuEa0XFh20eTzUM4NvCjhSU6d5DwIAoRHmIRSbCz 7hHbWyIXVoe0cz5bALvf9RiBu6bd7JRLXvcD8Kt/4exlf8I+A7aIXRqZG4uG4IVic9TRy9 8nOFdIanj0zUhgVEyyvhh5JLFW5296SuDTzV7HiEyxwMEe4ZbtlxqpmWugvY4cnbDjO5at tcz1DrjhIeOHl1YWARHQFv8Lbbc1A0RDjRH43/gJgIbbDyT3AOzwYZT109dOtM0Vf9rCD3 HPuUGljfza8gxviS+yD4IxM8eMl2wMcYS3+72uKntNs/D42PfG7nCUb8D9UXSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764598865; a=rsa-sha256; cv=none; b=c0ttdJqKun0vpSLLRJikGJQsneeIoQx4wexXJfw/gZ4JO/hXK99g70I23KFZiAAJLjcEz2 8XnkSzLVgjHOUTnfAzfZIX/i7L62tXHbI7lDKbbyNtqnq1T/fB5Kjx4bsX/EekTgXUA3sO 2vaWqVKI+tsy8b7rfOtZ28DWM6TSgOjA8xIz8bDoPTEAtX+il2vrVwNyQnjxpRfyBzg7Ng vFVdxVNXUCGeCxSN1r0DHCtXO8RMBTbrXAAN1bP/6SCLOUEQyRKXcGyiUGZ8rs5M7s2NES 9otuRGAwmgqaxtTmZdkxQUYP+Q4v+zh1zw5q19ANV4B6nF+CCcJ6+FFib35hBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKX6PP8z8W5 for ; Mon, 01 Dec 2025 14:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2924b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 14:21:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo From: Mark Johnston Subject: git: dfd35cd244c0 - main - libdtrace: remove sparc code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfd35cd244c081dad9bc0fa602ee230e4ea1d5c2 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 14:21:04 +0000 Message-Id: <692da450.2924b.60ec59da@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dfd35cd244c081dad9bc0fa602ee230e4ea1d5c2 commit dfd35cd244c081dad9bc0fa602ee230e4ea1d5c2 Author: Minsoo Choo AuthorDate: 2025-11-29 19:02:59 +0000 Commit: Mark Johnston CommitDate: 2025-12-01 14:19:19 +0000 libdtrace: remove sparc code Signed-off-by: Minsoo Choo Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1907 --- .../opensolaris/lib/libdtrace/sparc/dt_isadep.c | 338 --------------------- .../contrib/opensolaris/lib/libdtrace/sparc/regs.d | 120 -------- 2 files changed, 458 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/sparc/dt_isadep.c b/cddl/contrib/opensolaris/lib/libdtrace/sparc/dt_isadep.c deleted file mode 100644 index ed05275e7f83..000000000000 --- a/cddl/contrib/opensolaris/lib/libdtrace/sparc/dt_isadep.c +++ /dev/null @@ -1,338 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include -#include -#include -#include -#include - -#include -#include - -#define OP(x) ((x) >> 30) -#define OP2(x) (((x) >> 22) & 0x07) -#define COND(x) (((x) >> 25) & 0x0f) -#define A(x) (((x) >> 29) & 0x01) - -#define OP_BRANCH 0 - -#define OP2_BPcc 0x1 -#define OP2_Bicc 0x2 -#define OP2_BPr 0x3 -#define OP2_FBPfcc 0x5 -#define OP2_FBfcc 0x6 - -/*ARGSUSED*/ -int -dt_pid_create_entry_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp, - fasttrap_probe_spec_t *ftp, const GElf_Sym *symp) -{ - ftp->ftps_type = DTFTP_ENTRY; - ftp->ftps_pc = (uintptr_t)symp->st_value; - ftp->ftps_size = (size_t)symp->st_size; - ftp->ftps_noffs = 1; - ftp->ftps_offs[0] = 0; - - if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { - dt_dprintf("fasttrap probe creation ioctl failed: %s\n", - strerror(errno)); - return (dt_set_errno(dtp, errno)); - } - - return (1); -} - -int -dt_pid_create_return_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp, - fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, uint64_t *stret) -{ - - uint32_t *text; - int i; - int srdepth = 0; - - if ((text = malloc(symp->st_size + 4)) == NULL) { - dt_dprintf("mr sparkle: malloc() failed\n"); - return (DT_PROC_ERR); - } - - if (Pread(P, text, symp->st_size, symp->st_value) != symp->st_size) { - dt_dprintf("mr sparkle: Pread() failed\n"); - free(text); - return (DT_PROC_ERR); - } - - /* - * Leave a dummy instruction in the last slot to simplify edge - * conditions. - */ - text[symp->st_size / 4] = 0; - - ftp->ftps_type = DTFTP_RETURN; - ftp->ftps_pc = symp->st_value; - ftp->ftps_size = symp->st_size; - ftp->ftps_noffs = 0; - - for (i = 0; i < symp->st_size / 4; i++) { - /* - * If we encounter an existing tracepoint, query the - * kernel to find out the instruction that was - * replaced at this spot. - */ - while (text[i] == FASTTRAP_INSTR) { - fasttrap_instr_query_t instr; - - instr.ftiq_pid = Pstatus(P)->pr_pid; - instr.ftiq_pc = symp->st_value + i * 4; - - if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_GETINSTR, - &instr) != 0) { - - if (errno == ESRCH || errno == ENOENT) { - if (Pread(P, &text[i], 4, - instr.ftiq_pc) != 4) { - dt_dprintf("mr sparkle: " - "Pread() failed\n"); - free(text); - return (DT_PROC_ERR); - } - continue; - } - - free(text); - dt_dprintf("mr sparkle: getinstr query " - "failed: %s\n", strerror(errno)); - return (DT_PROC_ERR); - } - - text[i] = instr.ftiq_instr; - break; - } - - /* save */ - if ((text[i] & 0xc1f80000) == 0x81e00000) { - srdepth++; - continue; - } - - /* restore */ - if ((text[i] & 0xc1f80000) == 0x81e80000) { - srdepth--; - continue; - } - - if (srdepth > 0) { - /* ret */ - if (text[i] == 0x81c7e008) - goto is_ret; - - /* return */ - if (text[i] == 0x81cfe008) - goto is_ret; - - /* call or jmpl w/ restore in the slot */ - if (((text[i] & 0xc0000000) == 0x40000000 || - (text[i] & 0xc1f80000) == 0x81c00000) && - (text[i + 1] & 0xc1f80000) == 0x81e80000) - goto is_ret; - - /* call to one of the stret routines */ - if ((text[i] & 0xc0000000) == 0x40000000) { - int32_t disp = text[i] << 2; - uint64_t dest = ftp->ftps_pc + i * 4 + disp; - - dt_dprintf("dest = %llx\n", (u_longlong_t)dest); - - if (dest == stret[0] || dest == stret[1] || - dest == stret[2] || dest == stret[3]) - goto is_ret; - } - } else { - /* external call */ - if ((text[i] & 0xc0000000) == 0x40000000) { - int32_t dst = text[i] << 2; - - dst += i * 4; - - if ((uintptr_t)dst >= (uintptr_t)symp->st_size) - goto is_ret; - } - - /* jmpl into %g0 -- this includes the retl pseudo op */ - if ((text[i] & 0xfff80000) == 0x81c00000) - goto is_ret; - - /* external branch -- possible return site */ - if (OP(text[i]) == OP_BRANCH) { - int32_t dst; - int baa; - - switch (OP2(text[i])) { - case OP2_BPcc: - dst = text[i] & 0x7ffff; - dst <<= 13; - dst >>= 11; - - baa = COND(text[i]) == 8 && A(text[i]); - break; - case OP2_Bicc: - dst = text[i] & 0x3fffff; - dst <<= 10; - dst >>= 8; - - baa = COND(text[i]) == 8 && A(text[i]); - break; - case OP2_BPr: - dst = (((text[i]) >> 6) & 0xc000) | - ((text[i]) & 0x3fff); - dst <<= 16; - dst >>= 14; - - baa = 0; - break; - case OP2_FBPfcc: - dst = text[i] & 0x7ffff; - dst <<= 13; - dst >>= 11; - - baa = COND(text[i]) == 8 && A(text[i]); - break; - case OP2_FBfcc: - dst = text[i] & 0x3fffff; - dst <<= 10; - dst >>= 8; - - baa = COND(text[i]) == 8 && A(text[i]); - break; - default: - continue; - } - - dst += i * 4; - - /* - * Interpret branches outside of the function's - * bounds as potential return sites. If the - * branch is a ba,a don't skip the instruction - * in the delay slot. - */ - if ((uintptr_t)dst >= - (uintptr_t)symp->st_size) { - if (baa) - goto is_ret_baa; - else - goto is_ret; - } - } - } - - continue; -is_ret: - i++; -is_ret_baa: - dt_dprintf("return at offset %x\n", i * 4); - ftp->ftps_offs[ftp->ftps_noffs++] = i * 4; - } - - free(text); - if (ftp->ftps_noffs > 0) { - if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { - dt_dprintf("fasttrap probe creation ioctl failed: %s\n", - strerror(errno)); - return (dt_set_errno(dtp, errno)); - } - } - - - return (ftp->ftps_noffs); -} - -/*ARGSUSED*/ -int -dt_pid_create_offset_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp, - fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, ulong_t off) -{ - if (off & 0x3) - return (DT_PROC_ALIGN); - - ftp->ftps_type = DTFTP_OFFSETS; - ftp->ftps_pc = (uintptr_t)symp->st_value; - ftp->ftps_size = (size_t)symp->st_size; - ftp->ftps_noffs = 1; - ftp->ftps_offs[0] = off; - - if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { - dt_dprintf("fasttrap probe creation ioctl failed: %s\n", - strerror(errno)); - return (dt_set_errno(dtp, errno)); - } - - return (1); -} - -/*ARGSUSED*/ -int -dt_pid_create_glob_offset_probes(struct ps_prochandle *P, dtrace_hdl_t *dtp, - fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, const char *pattern) -{ - ulong_t i; - - ftp->ftps_type = DTFTP_OFFSETS; - ftp->ftps_pc = (uintptr_t)symp->st_value; - ftp->ftps_size = (size_t)symp->st_size; - ftp->ftps_noffs = 0; - - /* - * If we're matching against everything, just iterate through each - * instruction in the function, otherwise look for matching offset - * names by constructing the string and comparing it against the - * pattern. - */ - if (strcmp("*", pattern) == 0) { - for (i = 0; i < symp->st_size; i += 4) { - ftp->ftps_offs[ftp->ftps_noffs++] = i; - } - } else { - char name[sizeof (i) * 2 + 1]; - - for (i = 0; i < symp->st_size; i += 4) { - (void) sprintf(name, "%lx", i); - if (gmatch(name, pattern)) - ftp->ftps_offs[ftp->ftps_noffs++] = i; - } - } - - if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) { - dt_dprintf("fasttrap probe creation ioctl failed: %s\n", - strerror(errno)); - return (dt_set_errno(dtp, errno)); - } - - return (ftp->ftps_noffs); -} diff --git a/cddl/contrib/opensolaris/lib/libdtrace/sparc/regs.d b/cddl/contrib/opensolaris/lib/libdtrace/sparc/regs.d deleted file mode 100644 index 7c4bc0fac519..000000000000 --- a/cddl/contrib/opensolaris/lib/libdtrace/sparc/regs.d +++ /dev/null @@ -1,120 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -inline int R_G0 = 0; -#pragma D binding "1.0" R_G0 -inline int R_G1 = 1; -#pragma D binding "1.0" R_G1 -inline int R_G2 = 2; -#pragma D binding "1.0" R_G2 -inline int R_G3 = 3; -#pragma D binding "1.0" R_G3 -inline int R_G4 = 4; -#pragma D binding "1.0" R_G4 -inline int R_G5 = 5; -#pragma D binding "1.0" R_G5 -inline int R_G6 = 6; -#pragma D binding "1.0" R_G6 -inline int R_G7 = 7; -#pragma D binding "1.0" R_G7 - -inline int R_O0 = 8; -#pragma D binding "1.0" R_O0 -inline int R_O1 = 9; -#pragma D binding "1.0" R_O1 -inline int R_O2 = 10; -#pragma D binding "1.0" R_O2 -inline int R_O3 = 11; -#pragma D binding "1.0" R_O3 -inline int R_O4 = 12; -#pragma D binding "1.0" R_O4 -inline int R_O5 = 13; -#pragma D binding "1.0" R_O5 -inline int R_O6 = 14; -#pragma D binding "1.0" R_O6 -inline int R_O7 = 15; -#pragma D binding "1.0" R_O7 - -inline int R_L0 = 16; -#pragma D binding "1.0" R_L0 -inline int R_L1 = 17; -#pragma D binding "1.0" R_L1 -inline int R_L2 = 18; -#pragma D binding "1.0" R_L2 -inline int R_L3 = 19; -#pragma D binding "1.0" R_L3 -inline int R_L4 = 20; -#pragma D binding "1.0" R_L4 -inline int R_L5 = 21; -#pragma D binding "1.0" R_L5 -inline int R_L6 = 22; -#pragma D binding "1.0" R_L6 -inline int R_L7 = 23; -#pragma D binding "1.0" R_L7 - -inline int R_I0 = 24; -#pragma D binding "1.0" R_I0 -inline int R_I1 = 25; -#pragma D binding "1.0" R_I1 -inline int R_I2 = 26; -#pragma D binding "1.0" R_I2 -inline int R_I3 = 27; -#pragma D binding "1.0" R_I3 -inline int R_I4 = 28; -#pragma D binding "1.0" R_I4 -inline int R_I5 = 29; -#pragma D binding "1.0" R_I5 -inline int R_I6 = 30; -#pragma D binding "1.0" R_I6 -inline int R_I7 = 31; -#pragma D binding "1.0" R_I7 - -inline int R_CCR = 32; -#pragma D binding "1.0" R_CCR -inline int R_PC = 33; -#pragma D binding "1.0" R_PC -inline int R_nPC = 34; -#pragma D binding "1.0" R_nPC -inline int R_NPC = R_nPC; -#pragma D binding "1.0" R_NPC -inline int R_Y = 35; -#pragma D binding "1.0" R_Y -inline int R_ASI = 36; -#pragma D binding "1.0" R_ASI -inline int R_FPRS = 37; -#pragma D binding "1.0" R_FPRS -inline int R_PS = R_CCR; -#pragma D binding "1.0" R_PS -inline int R_SP = R_O6; -#pragma D binding "1.0" R_SP -inline int R_FP = R_I6; -#pragma D binding "1.0" R_FP -inline int R_R0 = R_O0; -#pragma D binding "1.0" R_R0 -inline int R_R1 = R_O1; -#pragma D binding "1.0" R_R1 From nobody Mon Dec 1 14:21:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKZ59b2z6JcJL for ; Mon, 01 Dec 2025 14:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKmKZ0d3Lz3Dcr for ; Mon, 01 Dec 2025 14:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VDHCOGU9uJFGz+lRtKLDwsHMnUNr7T/+ivLF9oL4rQc=; b=GeEQcY3duQmbMSPHCX+VxHpdFVUyaPiC28t4X0u4hEQPuiMzBbFeK44FBzdulVfGOB8kgx OLgXKq0xxzESgnCz9snGFrguo9CM9Bivq+RBtEdpnAmjRmZkNQLZBNRagHY8GkVmsTaDBD nE61zkieRYivV2COhcxCYx7TabjlH0qvp7kR9Bmi6ie2XBBEI+iZBvwey3XEIoI/Ch72fo rrh+xld8jsuuZ0lFWRVPwK1hUg9UbmspfJ30qXAszD6n6eapvFgN7PsbBrXoUM+E0eceCh 4MSj9E6Di/NQW+4w4Z95h7YitGz/u30vnV1TBiQ1Uk2DL5BhuNaNWDNrmqx9UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VDHCOGU9uJFGz+lRtKLDwsHMnUNr7T/+ivLF9oL4rQc=; b=ohc96I0LbZmD8OwJqxMEHISSOBi7fZ2tFAF1n2t/06ILVGAcr+XofSQIYIxBkghAcEM7Rn lh+jvpUzKe1x7k94yrJEBtkQZvQ0BQi4J98BDUQePutgWONj5V17BooNBdf4ZEcZHl7hD7 ROyqFtROueNW5lFKp5lrepr/6lSP+pATd4DPM1rJTXLox00lEC5DTUjWBVky268EV2GmkJ MYPFDaeu67/fcPYGgx9UEJ5j7lqPLIypP+JiZNHdV+A8Miyx+0MtSMhZZV8tBYnNQn8OuS lcZn1BOedTB2H/gy0qOxZFmqQFyNgk9YI6rK5vY7qUHGzfW0+xOuyRTxkmA69w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764598866; a=rsa-sha256; cv=none; b=BHfSys2a7BKxTbLCtR/o92SCFKOic2AzZ5XcPt/Rc9W6pmynBAsrgZBgTjJAYXtfPoI0fV jScifN3SHaf3ktVB5Aeq5OlsuKzPv7lJFJ1aXy5YqSbL9FCTJoJ8Zk0mJqDTjeJlfbcRzV 32G0uMM3s2ZAwnsH05RxKLN64Rys9fx4qYk744p+kzz453AS0TO766BfaoYE1yWbSOMzw3 tXwR8DaK4FpU++wFhrQ/1Luaypc7z53/UdeWYnWYbmGdtPxi1AiL3c0NVHCd5BljMtvwxk HZiGawLhGwkxsEl1ZsdGDmWOdk/o5aCv6zhJvaBcmxxcWyOlSnpTOmVeR/NjhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKZ05gwz8W7 for ; Mon, 01 Dec 2025 14:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 282c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 14:21:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo From: Mark Johnston Subject: git: d11ff7f93386 - main - opensolaris: remove references to sparc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d11ff7f93386f36a385ea01498fd9ff9ff3862ce Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 14:21:06 +0000 Message-Id: <692da452.282c0.39360269@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d11ff7f93386f36a385ea01498fd9ff9ff3862ce commit d11ff7f93386f36a385ea01498fd9ff9ff3862ce Author: Minsoo Choo AuthorDate: 2025-11-30 18:56:26 +0000 Commit: Mark Johnston CommitDate: 2025-12-01 14:19:19 +0000 opensolaris: remove references to sparc Signed-off-by: Minsoo Choo Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1907 --- .../cmd/dtrace/test/cmd/jdtrace/exception.lst | 1 - .../cmd/dtrace/test/tst/common/safety/tst.vahole.d | 4 ---- .../opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h | 9 --------- cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c | 13 ------------- .../opensolaris/lib/libdtrace/common/dt_program.c | 17 +++-------------- cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c | 4 ---- 6 files changed, 3 insertions(+), 45 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst index 19fc3aca51c2..035dd5cb694e 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst @@ -66,7 +66,6 @@ common/usdt/tst.reeval.ksh common/usdt/tst.static.ksh common/usdt/tst.static2.ksh common/usdt/tst.user.ksh -sparc/usdt/tst.tailcall.ksh common/pid/tst.provregex3.ksh common/pid/tst.provregex4.ksh diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d index 2ef40a5ac474..a285509316d9 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d @@ -38,11 +38,7 @@ fbt::: { n++; -#ifdef __sparc - trace(*(int *)0x8000000000000000 ^ rand()); -#else trace(*(int *)(`kernelbase - 1)); -#endif } dtrace:::ERROR diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h index e29654edb672..bebf9754f691 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h @@ -15,21 +15,12 @@ extern "C" { #define TESTER_ENTRY() \ __dtrace_tester___entry() -#ifndef __sparc #define TESTER_ENTRY_ENABLED() \ __dtraceenabled_tester___entry() -#else -#define TESTER_ENTRY_ENABLED() \ - __dtraceenabled_tester___entry(0) -#endif extern void __dtrace_tester___entry(void); -#ifndef __sparc extern int __dtraceenabled_tester___entry(void); -#else -extern int __dtraceenabled_tester___entry(long); -#endif #else diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c index 40200771fd4d..f2352ffe832a 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c @@ -1263,19 +1263,6 @@ alloc: else if (flags & DTRACE_O_ILP32) dtp->dt_conf.dtc_ctfmodel = CTF_MODEL_ILP32; -#ifdef __sparc - /* - * On SPARC systems, __sparc is always defined for - * and __sparcv9 is defined if we are doing a 64-bit compile. - */ - if (dt_cpp_add_arg(dtp, "-D__sparc") == NULL) - return (set_open_errno(dtp, errp, EDT_NOMEM)); - - if (dtp->dt_conf.dtc_ctfmodel == CTF_MODEL_LP64 && - dt_cpp_add_arg(dtp, "-D__sparcv9") == NULL) - return (set_open_errno(dtp, errp, EDT_NOMEM)); -#endif - #ifdef illumos #ifdef __x86 /* diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c index 232a3723b11d..ca7bf407290f 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c @@ -441,12 +441,8 @@ dt_header_decl(dt_idhash_t *dhp, dt_ident_t *idp, void *data) return (dt_set_errno(dtp, errno)); if (fprintf(infop->dthi_out, - "#ifndef\t__sparc\n" - "extern int __dtraceenabled_%s___%s(void);\n" - "#else\n" - "extern int __dtraceenabled_%s___%s(long);\n" - "#endif\n", - infop->dthi_pfname, fname, infop->dthi_pfname, fname) < 0) + "extern int __dtraceenabled_%s___%s(void);\n", + infop->dthi_pfname, fname) < 0) return (dt_set_errno(dtp, errno)); return (0); @@ -509,15 +505,8 @@ dt_header_probe(dt_idhash_t *dhp, dt_ident_t *idp, void *data) if (!infop->dthi_empty) { if (fprintf(infop->dthi_out, - "#ifndef\t__sparc\n" - "#define\t%s_%s_ENABLED() \\\n" - "\t__dtraceenabled_%s___%s()\n" - "#else\n" "#define\t%s_%s_ENABLED() \\\n" - "\t__dtraceenabled_%s___%s(0)\n" - "#endif\n", - infop->dthi_pmname, mname, - infop->dthi_pfname, fname, + "\t__dtraceenabled_%s___%s()\n", infop->dthi_pmname, mname, infop->dthi_pfname, fname) < 0) return (dt_set_errno(dtp, errno)); diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c index 42faaad65db5..815cc5478473 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c @@ -1360,11 +1360,7 @@ typedef struct fp_size_map { static const fp_size_map_t fp_encodings[] = { { { 4, 4 }, { CTF_FP_SINGLE, CTF_FP_CPLX, CTF_FP_IMAGRY } }, { { 8, 8 }, { CTF_FP_DOUBLE, CTF_FP_DCPLX, CTF_FP_DIMAGRY } }, -#ifdef __sparc - { { 16, 16 }, { CTF_FP_LDOUBLE, CTF_FP_LDCPLX, CTF_FP_LDIMAGRY } }, -#else { { 12, 16 }, { CTF_FP_LDOUBLE, CTF_FP_LDCPLX, CTF_FP_LDIMAGRY } }, -#endif { { 0, 0 }, { 0, 0, 0 } } }; From nobody Mon Dec 1 14:21:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKb3rTyz6JcfX for ; Mon, 01 Dec 2025 14:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKmKb1P0gz3Dlb for ; Mon, 01 Dec 2025 14:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S3WeHr83JSqM66cBU5M9so0qdBk/Q1qiMVncUOVSbT4=; b=XBGmFb42eRVb5UD5rzmHa3g1dF1iUNhYY4SYQI7ZAV5WOL8KAEZ7L9wbPlrnY7LTfmrfKW BmPubWrTJRPqaSd7fXmu89glN4pygitoFEfU/NPGe4UctxYPgXQoAlRUEW50gqwvG/kmhi NxI7C9Xen0r65jDpzFv0Urp7nUny5iizzf/2KVJiZVVNKzFAnTmoa7Q3AkIN9hBbU9Z6Lo kTBZZh/sv7s0IXE9bF2I1jv9ceXTAkFwdhwfq2QucgJV/dJIpf9iw8AeJuBiNhYXvRYku4 c+bhCfgQCvW+7NWvKv/LWoI6XQscWEbt3ZIpLhcu+G6aiJuXIDLXEOivApIjmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S3WeHr83JSqM66cBU5M9so0qdBk/Q1qiMVncUOVSbT4=; b=b4HcR9Q3i+BEY1H15TO5XKe1N202heJQmHdFszkzL6oCI36MsYSwsboC1/1aTCzFegdJEJ vhGhVnKeTuW6Dmrhka4I+o6ULopYlnGKqwLNtPTDCPoCdZNNM6It7y9/tj3UNqa2HnwdU4 8HUi7diNlsAC+usxJtzH1xZXDoGSIUyTZxSOM3QFF5VH3w4aLXJxS9studzdp7vdZ/qWxK FRP2r/OIb/0cwvOj5JhsW+lx3VAW3oVQo3VM3lxbQ7iPsVFUwqEvRoLbauft03l8mPExEh FLrTSlg3xC22elvn1qesGigGauMb/K4wE6FBpRzzJaTX5rUadPr8LFZvo9eFKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764598867; a=rsa-sha256; cv=none; b=tknJBNRXtfjFEXgAud0qOZDqLBSOC+rc9G61Y3eL4smr6K02bbmpzZf5pEHuQI4WX7tRhD tXU6Qc20FFOeu4kKeVYejP5+hDAONvO67Lqo5dMIQmRz1X1G7Mr3N9QLUvbnM8HW+uZHk/ bbcoI5CBcy/TUEQsioZlcDWFXeo3gAmIvGBmTlzApPVngO0NoFUYUqqY/lB3+SGFdBkDI0 AB6A+vBcEtHjTCAywE36BDjYzUDjCoEKgdsgpPtlk40EGKt1ApnrBoSG5si7B7NyBc4xPb giUptLuaWuP3ZTvKoiDdRfswCGicfuvx9PEoH5kE3w2e87ncKwZSye3TxXySrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKb0rl3z7xL for ; Mon, 01 Dec 2025 14:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2afe5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 14:21:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo From: Mark Johnston Subject: git: 507cfc42799f - main - dtrace.1: remove sparc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 507cfc42799f38d6960cd3a14eb66294c5fda4ff Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 14:21:07 +0000 Message-Id: <692da453.2afe5.43770ce7@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=507cfc42799f38d6960cd3a14eb66294c5fda4ff commit 507cfc42799f38d6960cd3a14eb66294c5fda4ff Author: Minsoo Choo AuthorDate: 2025-11-30 19:01:14 +0000 Commit: Mark Johnston CommitDate: 2025-12-01 14:19:19 +0000 dtrace.1: remove sparc Signed-off-by: Minsoo Choo Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1907 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 86887bbe8dd9..786c3d6e50d1 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 12, 2025 +.Dd November 30, 2025 .Dt DTRACE 1 .Os .Sh NAME @@ -837,10 +837,6 @@ __unix .It __SVR4 .It -__sparc (on SPARC systems only) -.It -__sparcv9 (on SPARC systems only when 64-bit programs are compiled) -.It __i386 (on x86 systems only when 32-bit programs are compiled) .It __amd64 (on x86 systems only when 64-bit programs are compiled) From nobody Mon Dec 1 14:21:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKg0jkTz6JcPT for ; Mon, 01 Dec 2025 14:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKmKc20Ldz3DnG for ; Mon, 01 Dec 2025 14:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eyygWN1bp3VCT2AsSnDOvsJRcgRZSBJPstWQgWpQd4I=; b=Tt85bEirfQqXq8KEgQ/lc60A3D+bIw8KNKuuPY5C/5ul/RNGVBHbFGTD7v09EvTGHhXIIM J5fR1HcVjZWA2yh0IPyIln3/PbQSOzc9JmO71R9/tzZJZa2esZ9UMi4UmlCzoyXisHCjT7 MS/okBG/jcD4dLBF5JT6xehe2e0kiDHnxMTe22xYnOUFNAo8ntxYkYE92w/5XenH7ZPbaf i59UK4uNZQAouGydEetT1a5JiIA/llNC9GB2Uyv4kP2zuyC0oOT0LHD0sEyeoIrC2I7K23 7VpEFgInV/VPbsHuz1Bs3sMI0mlvbFW0HtHJfXSTvLVffsAFJ2gW+w6ZoIH1Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764598868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eyygWN1bp3VCT2AsSnDOvsJRcgRZSBJPstWQgWpQd4I=; b=k4lf4b9piy3nYV6qAlqHOnDz4P7wnR8zClcJ5FQDRLf4qjlVlXmEtt53ViVO5g6Ai3xiBm 3EXoERwZw9DnSnv98tWA2HnS1DDyND8bcAWOa5Q2NmCsNGRqRFOnMEuJLkVa2+zBE4KSZZ KaqzuNAp+6BHysC29r3eKdM8oojjTHiRumal/c6FpKCr6SsIHKkglnbFTZt9RTqc2H8vG1 l7DflCl7E02x6j0HeafY2V5g6KH025nrYTMSCtCjykcOOzXb5UL0c3StG+9OxYKc/Y1s0l z7mK9Q3YZywHsGFL0gaBipFSRQQUcO+Du5wUtShap9iuGBTCYKI5UhMqAg/lAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764598868; a=rsa-sha256; cv=none; b=Ao1omfYt9DUEE3UOlZAbmDs+1/0em155QRB60cMDHnO9zPNPGXIvWmgHRmM0//uRj+TVvG z4wcX22LuJC4GavICNemxcKZkctHiGfPg8bMiVvieoVNi0nm4w8hgb7jI8+I3mWpAD/x86 m9JI1ylaYnZIhse20MQTHEtKjkC7kurGF7QzCePyxoJ5ffFR90FFUGQg+ktS2BWTZNEYAM HUu73koD24Ye+uP3TKAPprWR4nCOdrA62cl+mGERqom605He/JecyRqD8ZGQ4pP61F2A4e kp+71AIKqG9089sIOSamNS8howbboIWjpuqzsc6B/temY48D0f0oyKPqEr7Dow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKmKc1Tx4z8DY for ; Mon, 01 Dec 2025 14:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 29c3b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 14:21:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 17fd7780fbbb - main - dtrace tests: Update names after the syscall::exit probe was renamed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17fd7780fbbb59932b72b5dac6bda93f67743b83 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 14:21:08 +0000 Message-Id: <692da454.29c3b.11058e5e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=17fd7780fbbb59932b72b5dac6bda93f67743b83 commit 17fd7780fbbb59932b72b5dac6bda93f67743b83 Author: Mark Johnston AuthorDate: 2025-12-01 13:46:20 +0000 Commit: Mark Johnston CommitDate: 2025-12-01 14:20:06 +0000 dtrace tests: Update names after the syscall::exit probe was renamed MFC after: 1 week Fixes: e7e964cb2ebd ("syscalls: normalize _exit(2) declerations") --- cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d | 2 +- cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d | 2 +- cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d | 2 +- cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d index e8fc9b4dfba1..1324d4eaec4f 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d @@ -54,7 +54,7 @@ pid$1:a.out:go: exit(1); } -syscall::exit:entry +syscall::_exit:entry /pid == $1/ { exit(0); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d index 30bf5ae4bf0a..64fe885b6124 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d @@ -54,7 +54,7 @@ syscall::getpid:entry timeout = timestamp + 500000000; } -syscall::exit:entry +syscall::_exit:entry /pid == $1/ { exit(0); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d index 7d18442d7408..8b08bface705 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d @@ -54,7 +54,7 @@ syscall::getpid:return timeout = timestamp + 500000000; } -syscall::exit:entry +syscall::_exit:entry /pid == $1/ { exit(0); diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d index 30bf5ae4bf0a..64fe885b6124 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d @@ -54,7 +54,7 @@ syscall::getpid:entry timeout = timestamp + 500000000; } -syscall::exit:entry +syscall::_exit:entry /pid == $1/ { exit(0); From nobody Mon Dec 1 14:53:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKn3F3cRlz6Jg8l; Mon, 01 Dec 2025 14:53:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKn3F35s1z3KfZ; Mon, 01 Dec 2025 14:53:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764600825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CUUJY7s130npIql9xR0r46+qEVZ7xHA5wSSAQFIKdVc=; b=UmQLvfbutS3TVAr+9ceRxQmhdWDqk7dGdo0ZNBVGB83+Q/l6QPVz6DmmOY6amHOQ1iv6Gm iws680kok4Lb2tc+bSoXxMJQPBG3JmgX8P8eZypAP/PYzQXvSYQrb6589QGgiHhxFbDj+Q JfdE0ZW5lxO781v4Mjs1VJu/2LxXLnyFGg4dfHKrGFXJecghDuOezGvUE9rzn2BDg2W8lM XfVTXbB83Ba6GEv2FQDyNNKQQhIKrZObjnWkcQ5wMm6QKPtNdVxt/IavRWvbZ2tztR4FCN 00cCOfuxUj9QKG7DZU1LQhvfOUSKElp7Uk3Ln3NF/6Qh3FiGXkvx2ZUS544f0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764600825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CUUJY7s130npIql9xR0r46+qEVZ7xHA5wSSAQFIKdVc=; b=fGmGZrKHg+O/SxtInD7R6j1Akop5uR5shSkunHZuUT7l2vMc5WpQVg2uiMRy/lOyciAFzL Y9TgmZ/8U5ybjrwUhhl4uS1Ve5/9AXoaP+wFOBDYsGIJyIkYve9BeM5qfkbTW4bl3AG/Dp RvKr5QovQ64kRwplsCmojnDaTVI3IedqRz+WmY38BG78zNqpNDVzbnrcBJYXG1SFDn3NYe 8nX9LHJb3x8TvSzLOknz0JNJhsFE3K7EXvGN2b5nzlChuo79NcCprdfdxtUk0CypJfGRfx ErGJHZmsXIZn2ko5nLhRCC1IkabWSpTkDWQGeTJXzFJaZutMtFnYBqYrzi0Hzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764600825; a=rsa-sha256; cv=none; b=ZsNNYi07RtEFy/L0NtkYaj/UIdbPILFpCz2+feF6GidZRj/ojFKEHLTXnxEBnxoMhizwq/ 05ePsZSKhc8+uD+RwXRaOWygccvN6CnbybL6Y05OpBRfL80uKoKP5QM8ujLH+SpKrZdJIM C8z/JTPZppyD2QONwknf92SOdkgyPXD2IHxtIchaf/Uv7AmQCDsy9IiR44tvEvwbJxfNqC n76kSiCfPDto8m3lOObEcNE8mcNQZ0TvwfUyd6725gCLTrgY7mqogEGJ2/WgWKSImfsH2l mXwodgoeb+QIKbrarjHyG5gy17BIQ21uhk43taOArDas9b0LcnFo+sMvgdYBtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:4cbc:6bd:30e8:ed5d] (unknown [IPv6:2601:5c0:4202:5670:4cbc:6bd:30e8:ed5d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dKn3F1C4Hz6vV; Mon, 01 Dec 2025 14:53:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <6365e335-fcc8-4590-af40-230815012f9d@FreeBSD.org> Date: Mon, 1 Dec 2025 09:53:44 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 301b8a806f79 - main - nvme: Minor style(9) fixes Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <6925d6af.3b42c.336a0065@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <6925d6af.3b42c.336a0065@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/25/25 11:17, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=301b8a806f79292ee3324ca938a4d938df1911e8 > > commit 301b8a806f79292ee3324ca938a4d938df1911e8 > Author: Warner Losh > AuthorDate: 2025-11-25 16:10:23 +0000 > Commit: Warner Losh > CommitDate: 2025-11-25 16:12:51 +0000 > > nvme: Minor style(9) fixes > > needs to be first after . And we don't need > both sys/param.h and sys/types.h. > > Fixes: 032fbda024d78 > Sponsored by: Netflix > --- > sys/dev/nvme/nvme.h | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h > index 3de65a4a481f..ddbc149802f4 100644 > --- a/sys/dev/nvme/nvme.h > +++ b/sys/dev/nvme/nvme.h > @@ -29,15 +29,13 @@ > #ifndef __NVME_H__ > #define __NVME_H__ > > -#ifdef _KERNEL > -#include > -#endif > - > #include > -#include > -#ifndef _KERNEL > +#ifdef _KERNEL > +#include > +#else > #include > #endif > +#include > > struct sbuf; > > @@ -1909,7 +1907,6 @@ void nvme_sc_sbuf(const struct nvme_completion *cpl, struct sbuf *sbuf); > void nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen); > > #ifdef _KERNEL > -#include > #include I should perhaps just move this to the top as well so all the #include's are in one place. -- John Baldwin From nobody Mon Dec 1 15:18:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKnbP3sp4z6JjkL; Mon, 01 Dec 2025 15:18:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKnbP2sK6z3Pq2; Mon, 01 Dec 2025 15:18:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764602289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DXKQvGpQ92xj5H1i7pigcZi5BGrdnF6n7xIc3KcpX/k=; b=CkR5ytAAxLW2qTNuo+HDyK8AUZmp/0PDP9ONGVQAfhnhW+3zEyl5hcyPhvGsuc6E14/BEN +1XuvM+eAVwi9stHyxX/IJ6vIXLcrOszazkl6L8qfgJHBesr2KNLUT8yRi40s+N1FkTDCI Z4RdwEkTRb/oQ/ycKMz/p+a4bR6hGvkmIdOJmCRoB6Ur2Oige6BOe+osG0LKS2nnx66wZ/ vw8MM7qM3zGcLqPDy1OVYaO+0OoZpqea0oY0G2xw97hsaRzE3maK1/ZOq29HGNU4IW5Jx5 DZGiYMUkT++cgSB5xAkWOpGuLZUdPV70T7YL/eOfEUrWFVZYJhRpEnXiQNfVDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764602289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DXKQvGpQ92xj5H1i7pigcZi5BGrdnF6n7xIc3KcpX/k=; b=Wx2ElfEgxpsPZtB+lhz+roX7fRq+nZwk59LHcguSUU1ACgSmCM+GQ0FWDFEIjMKjMl0T/W G+J0CM8wNMMmG4r4JnJSX8nz5HZDyGS16jAdfWcuzQYEDGwDvRrPja1oxvU4asEgTjd587 pU7eojdvFR6r8MOFp101MIhj03jZxCfJddn0n3r0D4xDjEGB7k90Sow5Zaz9e3tRwCuDZM DDIYEpDg9H0H1IuLmHyCCVBNp2u0idzMUVLGE7BHW472aBpt4IQO2NyAGU7xYbfMeKqfNy ol17xE7hT6LHkRFomLXeHz8vsDjOct3dQKqv2WOSWR2vNRTGMsF8To76PCoL9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764602289; a=rsa-sha256; cv=none; b=yyTPdbyGEMTg3srzq4pFbDEzHXkeaIsuTwSKViovujnbCCeNS895KEeEFtU5Z1jsH4DXmY dQUb3JqgtPGKnOPDF7up1W1hM9jNhwtM6WguGVHD3FACPKSlMy01adyZinwmE2lfWmu5A5 pE241oPKFxMOyHHZ4AEALvg5OT+F5wd8m+ud2hqslzGOU/NspMXLCCnUXSJ1azwbpdFaPe fcbjlU6E8ppFuIOv//aQrptNKNGrO7OE7eOkG8+qsJGljhv0XslRRtMPHdsv4oGnhkZTzQ QgGSkoyq9RsntSw99HzowD0yc2LJGE8cIKgq1rZO9mAX1F7JBgEdV/TUJ1BRFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:4cbc:6bd:30e8:ed5d] (unknown [IPv6:2601:5c0:4202:5670:4cbc:6bd:30e8:ed5d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dKnbP0XR4z8Xh; Mon, 01 Dec 2025 15:18:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 1 Dec 2025 10:18:08 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: f42421307b11 - main - sys: remove armv6/6.1 support from debug monitor Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo References: <692a8ea7.feb1.63d10382@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <692a8ea7.feb1.63d10382@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/29/25 01:11, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f42421307b115345ea1a6c8fdf61fbb581e4400f > > commit f42421307b115345ea1a6c8fdf61fbb581e4400f > Author: Minsoo Choo > AuthorDate: 2025-11-29 00:34:40 +0000 > Commit: Warner Losh > CommitDate: 2025-11-29 04:56:36 +0000 > > sys: remove armv6/6.1 support from debug monitor > > Signed-off-by: Minsoo Choo > Reviewed by: imp > Pull Request: https://github.com/freebsd/freebsd-src/pull/1903 > --- > sys/arm/arm/debug_monitor.c | 30 ------------------------------ > 1 file changed, 30 deletions(-) > > diff --git a/sys/arm/arm/debug_monitor.c b/sys/arm/arm/debug_monitor.c > index 7944becbae4d..4d61896a2142 100644 > --- a/sys/arm/arm/debug_monitor.c > +++ b/sys/arm/arm/debug_monitor.c > @@ -83,8 +83,6 @@ static uint32_t dbg_breakpoint_num; > #define ID_DFR0_CP_DEBUG_M_SHIFT 0 > #define ID_DFR0_CP_DEBUG_M_MASK (0xF << ID_DFR0_CP_DEBUG_M_SHIFT) > #define ID_DFR0_CP_DEBUG_M_NS (0x0) /* Not supported */ > -#define ID_DFR0_CP_DEBUG_M_V6 (0x2) /* v6 Debug arch. CP14 access */ > -#define ID_DFR0_CP_DEBUG_M_V6_1 (0x3) /* v6.1 Debug arch. CP14 access */ > #define ID_DFR0_CP_DEBUG_M_V7 (0x4) /* v7 Debug arch. CP14 access */ > #define ID_DFR0_CP_DEBUG_M_V7_1 (0x5) /* v7.1 Debug arch. CP14 access */ Humm, I would have probably left these as the register is still valid and I find it useful to describe the full range of values for registers that we define constants for. The rest of the removal certainly makes sense. > > @@ -594,10 +592,6 @@ dbg_enable_monitor(void) > dbg_dscr = cp14_dbgdscrint_get(); > > switch (dbg_model) { > - case ID_DFR0_CP_DEBUG_M_V6: > - case ID_DFR0_CP_DEBUG_M_V6_1: /* fall through */ > - cp14_dbgdscr_v6_set(dbg_dscr | DBGSCR_MDBG_EN); > - break; Should this function also be removed? Looks to be defined here in sys/arm/include/cpu.h: _WF1(cp14_dbgdscr_v6_set, CP14_DBGDSCRext_V6(%0)) -- John Baldwin From nobody Mon Dec 1 15:27:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKnpn3jYQz6JkfP; Mon, 01 Dec 2025 15:28:01 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKnpm56Ctz3RHm; Mon, 01 Dec 2025 15:28:00 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 5B1FRpgQ009716 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 1 Dec 2025 16:27:52 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 5B1FRpNC009715; Mon, 1 Dec 2025 16:27:51 +0100 (CET) (envelope-from fuz) Date: Mon, 1 Dec 2025 16:27:51 +0100 From: Robert Clausecker To: Brooks Davis Cc: Dag-Erling Sm??rgrav , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 029a09f18032 - main - sys/_types.h: Actually unbreak gcc build Message-ID: References: <692c1d02.367c7.22c28c58@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dKnpm56Ctz3RHm Am Mon, Dec 01, 2025 at 09:40:40AM +0000 schrieb Brooks Davis: > On Sun, Nov 30, 2025 at 10:31:30AM +0000, Dag-Erling Sm??rgrav wrote: > > The branch main has been updated by des: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=029a09f18032353a9ae874590b879322efc6e53a > > > > commit 029a09f18032353a9ae874590b879322efc6e53a > > Author: Dag-Erling Sm??rgrav > > AuthorDate: 2025-11-30 10:30:45 +0000 > > Commit: Dag-Erling Sm??rgrav > > CommitDate: 2025-11-30 10:31:09 +0000 > > > > sys/_types.h: Actually unbreak gcc build > > Thank you for addressing this issue. I'm going to follow up with a > different approach that doesn't use __has_feature. It's annoying how > recalcitrant GCC has proved about this functionality. Maybe we should add __has_feature() polyfill to . Yours, Robert Clausecker -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Mon Dec 1 15:31:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKntf2Hdyz6JksM; Mon, 01 Dec 2025 15:31:22 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKntd6KyTz3S8S; Mon, 01 Dec 2025 15:31:21 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 5B1FVJZV009787 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 1 Dec 2025 16:31:20 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 5B1FVJEj009786; Mon, 1 Dec 2025 16:31:19 +0100 (CET) (envelope-from fuz) Date: Mon, 1 Dec 2025 16:31:19 +0100 From: Robert Clausecker To: Jessica Clarke Cc: Kristof Provost , Robert Clausecker , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 2fb8cbc6ef1b - main - libc/tests: add stdbit test framework and unit tests Message-ID: References: <692c9966.26e27.70621b5b@gitrepo.freebsd.org> <3E139664-C0CE-4BB9-9225-66D7D44D644E@FreeBSD.org> <6903AA87-20BC-4060-A199-4100FC7CD8EB@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <6903AA87-20BC-4060-A199-4100FC7CD8EB@freebsd.org> X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dKntd6KyTz3S8S Hi Jessica, Am Mon, Dec 01, 2025 at 02:04:22PM +0000 schrieb Jessica Clarke: > On 1 Dec 2025, at 13:56, Kristof Provost wrote: > > > > On 30 Nov 2025, at 20:22, Robert Clausecker wrote: > > The branch main has been updated by fuz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2fb8cbc6ef1b3cc6cd60e5db07f8305623f9b044 > > commit 2fb8cbc6ef1b3cc6cd60e5db07f8305623f9b044 > > Author: Robert Clausecker fuz@FreeBSD.org > > AuthorDate: 2025-11-18 17:33:12 +0000 > > Commit: Robert Clausecker fuz@FreeBSD.org > > CommitDate: 2025-11-30 19:21:52 +0000 > > libc/tests: add stdbit test framework and unit tests > > > > This adds unit tests for all 70 functions in . > > > > I'm sorry for the test framework, but it makes it so I don't > > have to write 70 unit tests by hand. > > > > Reviewed by: adrian, des > > Approved by: markj (mentor) > > MFC after: 1 month > > Differential Revision: https://reviews.freebsd.org/D53660 > > > > I’m having issues running the tests now. > > I get this kyua error doing kyua list in /usr/tests/lib: > > kyua: E: Load of 'Kyuafile' failed: Failed to load Lua file 'Kyuafile': Kyuafile:48: Load of 'libc/Kyuafile' failed: Failed to load Lua file 'libc/Kyuafile': libc/Kyuafile:19: Load of 'libc/stdbit/Kyuafile' failed: File 'libc/stdbit/Kyuafile' not found. > > > > That’s presumably because there’s no Kyuafile (or indeed anything at all) in /usr/tests/lib/libc/stdbit. > > It’s not immediately obvious to me what went wrong to cause that, but I’m relatively confident it’s related to this commit. > > Best regards, > > Kristof > > Because TESTSDIR is /usr/tests/lib/libc/tests/stdbit thanks to the > location of libc’s tests in the src tree. That’s meant to be overridden > for every subdirectory, whether by including ../Makefile.netbsd-tests, > in the case of all the NetBSD-imported ones, or by manually overriding > it, such as in lib/libc/tests/iconv/Makefile. > > It would've been nice to test these tests prior to commit. Was that not > done? I ran "make check" in lib/libc/tests/stdbit and it seems to have passed. I was not aware that this is insufficient. I will develop a fix and add it. A guide on how to add a new directory to the test suite would also be nice. Yours, Robert Clausecker -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Mon Dec 1 15:33:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKnxl6Mtyz6Jkw2 for ; Mon, 01 Dec 2025 15:34:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 4dKnxl4CXGz3SWr for ; Mon, 01 Dec 2025 15:34:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-477563e28a3so29389005e9.1 for ; Mon, 01 Dec 2025 07:34:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764603242; x=1765208042; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pFQuMTl/NWkK/YpatDEKTT6R86YryTGUTNFOw/rmHTs=; b=GXK0hb51cb4Pc3UX7EFHZiV+A9v4XxtMHH7O3reIezpgMaYH9sBqPXdqMfv7g5m1UK 2wz5RfgIDFt3m/mHQQ+tnMA4tiJ0cVrAEvfhJDW1dXhPBcuOPflO/eOMYoggpkhvzMyu tKOoIPRv3rwdjJX6OYD8VPsMwmUuHKA8yIN0ahCt1QFG1zpNiG5sgW2MSHC3lcHKoyxh x8uyendBUx+lEIAemIT312kIssQ3dCfPBhLV2uL5KvAJMXK0lwX1BuRNWLYXHkA7w5Pv onnLif+eATKyW09XoGcUs2sztKLm2AKhrgWqmvh7YZ5rWDxXl/uT+lDsAAIMZq2QENBT wRBw== X-Forwarded-Encrypted: i=1; AJvYcCXVGhwcbM6xdx3xxJKVFvdnFtZbeI+1gbF55++1vC5VJo4VIucY66dKH174XlF12yI3UBodpLTZAeuRDjBunjabY+XjfA==@freebsd.org X-Gm-Message-State: AOJu0YyrNQMa5XFiVu+mV54nQPpTpLSo+ltsDZB3HiL6s7RZPYePjIvf Lsx1EZYfxePME1T4YcypYfEIjHyiFvC7DFNFhsIjV7o7xmSC4i0hcMPSXrpvX8trnnY= X-Gm-Gg: ASbGnct5CvZ0i2rWc22iQ4yiz2q7uZfCV/34WjU/LEycXQGcyO6v+Vt0fQpdVe4Gb3/ cXz23gTOCkgctVoLBN3f6lQhY70tWb0KDpH9LO5RMISatmfNBD6DIonoXUzisYvhOihdprGlTuL A1UfQjRMxaEWmb7HAwUo1gWUCxn/PQtLYojlkhZJEtIkKfmEM0Cg7OCNk6LyyHI/Zh7nyg92QSc y9xc7c+IhpspDyp/1norhuzp9TNLjY0xlebw+hd4fADTl+WYBy6f0lqCnMYhWp7L2czJ+Qckdfk uy02g0gtTVkIQFScM8Aw4JXFpbuKAkqbhzG3gqp9uJZtfbgAB7LPsYgHaE864uKFpHc5mvd55wH sDgD8O+QqEFDEWSVU53Rcs3gPaJGfq87frCtfKJZczPQUyRCdGh2vk8hoR/buZ/MD5hxcp/g/cJ p06Ge77umzar44oBOxMS5xFGyD2iErZful7dPgQCJrWFJr6lb8JZ8j X-Google-Smtp-Source: AGHT+IGfWBkjOePsq5nt3CwNKPFA8dfScmKmgD35ZDlgcL8OMk+t/imfn4gIDrtmLaLSVAxkOuL69g== X-Received: by 2002:a05:600c:204b:b0:477:9d31:9f76 with SMTP id 5b1f17b1804b1-477b9ee4fd0mr317168495e9.12.1764603241506; Mon, 01 Dec 2025 07:34:01 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42e1ca1a396sm26632191f8f.22.2025.12.01.07.34.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Dec 2025 07:34:01 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.200.81.1.6\)) Subject: Re: git: 029a09f18032 - main - sys/_types.h: Actually unbreak gcc build From: Jessica Clarke In-Reply-To: Date: Mon, 1 Dec 2025 15:33:50 +0000 Cc: Brooks Davis , Dag-Erling Sm??rgrav , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <692c1d02.367c7.22c28c58@gitrepo.freebsd.org> To: Robert Clausecker X-Mailer: Apple Mail (2.3864.200.81.1.6) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dKnxl4CXGz3SWr On 1 Dec 2025, at 15:27, Robert Clausecker wrote: >=20 > Am Mon, Dec 01, 2025 at 09:40:40AM +0000 schrieb Brooks Davis: >> On Sun, Nov 30, 2025 at 10:31:30AM +0000, Dag-Erling Sm??rgrav wrote: >>> The branch main has been updated by des: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D029a09f18032353a9ae874590b879322= efc6e53a >>>=20 >>> commit 029a09f18032353a9ae874590b879322efc6e53a >>> Author: Dag-Erling Sm??rgrav >>> AuthorDate: 2025-11-30 10:30:45 +0000 >>> Commit: Dag-Erling Sm??rgrav >>> CommitDate: 2025-11-30 10:31:09 +0000 >>>=20 >>> sys/_types.h: Actually unbreak gcc build >>=20 >> Thank you for addressing this issue. I'm going to follow up with a >> different approach that doesn't use __has_feature. It's annoying how >> recalcitrant GCC has proved about this functionality. >=20 > Maybe we should add __has_feature() polyfill to . There is one, but sys/_types.h does not include sys/cdefs.h. Jessica From nobody Mon Dec 1 15:34:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKny06YVYz6Jkng; Mon, 01 Dec 2025 15:34:16 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKny04zGLz3T1G; Mon, 01 Dec 2025 15:34:16 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 5B1FYEM0009875 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 1 Dec 2025 16:34:15 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 5B1FYEao009874; Mon, 1 Dec 2025 16:34:14 +0100 (CET) (envelope-from fuz) Date: Mon, 1 Dec 2025 16:34:13 +0100 From: Robert Clausecker To: Jessica Clarke Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5f529f9e292a - main - libc: Fix TESTSDIR for new stdbit tests Message-ID: References: <692da1c6.289b3.56e4faf@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <692da1c6.289b3.56e4faf@gitrepo.freebsd.org> X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dKny04zGLz3T1G Hi Jessica, Am Mon, Dec 01, 2025 at 02:10:14PM +0000 schrieb Jessica Clarke: > The branch main has been updated by jrtc27: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5f529f9e292a30c065c316ed5fd0d23e07b26e5c > > commit 5f529f9e292a30c065c316ed5fd0d23e07b26e5c > Author: Jessica Clarke > AuthorDate: 2025-12-01 14:06:21 +0000 > Commit: Jessica Clarke > CommitDate: 2025-12-01 14:06:21 +0000 > > libc: Fix TESTSDIR for new stdbit tests > > Otherwise the directory created by etc/mtree/BSD.tests.dist, which is > where these belong, and referred to by the generated Kyuafile for > /usr/tests/lib/libc (via stdbit's existence in TESTS_SUBDIRS), ends up > empty with no Kyuafile, which is an error for kyua. > > Reported by: kp > Fixes: 2fb8cbc6ef1b ("libc/tests: add stdbit test framework and unit tests") > --- > lib/libc/tests/stdbit/Makefile | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/lib/libc/tests/stdbit/Makefile b/lib/libc/tests/stdbit/Makefile > index 37450056007a..8dbc86528de3 100644 > --- a/lib/libc/tests/stdbit/Makefile > +++ b/lib/libc/tests/stdbit/Makefile > @@ -1,3 +1,5 @@ > +TESTSDIR= ${TESTSBASE}/lib/libc/stdbit > + > # ensure libc functions are tested, not clang's builtins > CFLAGS+= -fno-builtin Many thanks for the quick fix! Yours, Robert Clausecker -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Mon Dec 1 16:53:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKqj82C0Gz6JtJq for ; Mon, 01 Dec 2025 16:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKqj75y2sz3jxq for ; Mon, 01 Dec 2025 16:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764607995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SBYaaXLu5k22DmCtysib+O1CX4+4BJfwXCjnSoGPXPg=; b=uV6YFJNXD1PawQ/rjMhtiySDXwmu55FyBCMtgcxRlRa5guayT+2kXYRWOYSE131MoqMQiq IeSnwy162cPVC9kyIq79tD4Ahile2gDhu4osZjzCcF7W8QYUowBDtsaKvNSE3/YeUCFMy2 Ex6of9bULXgL/N9tjo1Gs5QBkVFH7UY94k9PCORLlxkrcdlruc2AUN+df7Y+Yw3QTYTYb+ 2eyPpJnz+6GLXBodP9BKpVeTiYC2bm+nTLtroWRGIcQyp4AbOo15IBZTxNIH/ZndTLln5s vefvpqx+KGjS+zxcNKFWwPNBgb0PdPudikpaKlGjt4EShwlT+ZgKfzcp7dFVnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764607995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SBYaaXLu5k22DmCtysib+O1CX4+4BJfwXCjnSoGPXPg=; b=NPMiJwnx1LgaYJ1CBrNN+SenN5nNk2RJulP48wKmN/4y6cklOX51NwndD5kZHIe68zErwY FjhIKBD0Vg79aKg3KWNr+OL+wRrfIx7fPSGAzcp53tHozdwvJ/Lg/1hHPDzH6JLRF5iRlH k6nKqvx4TG79bIO+tu9bStGShS++JUa7tmqdrFOqfzCgwMwUVuZQZAIZc2CrK053Pp7eNI hgKXUQGL3dLHi4LVzw+yRGYo9m/Bw6UZWji/MIMj0r3ig1o1SGMjeoDY3ZGe/nm1ow58e2 zuf8GOK3g0Jav1clWJjyKbOw0RBpLp5zpdqBqtakdcCFK5BqTgQrMLklRzux0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764607995; a=rsa-sha256; cv=none; b=dym313qkr680Hqx0PCiw0x1HaWbLO8ySKvlgfx3Rgeb5lrTIxykWNg/XhGMEELXO7SO0SE jC5zNnmG+fwaKr+7/m9m0sHZTI/VErzM8MMkHlBzVbR8Z8/7ccJtekL8IKxr3Q1pMW4FJt c0v2lKrZvn1NC1YAKP4UQ8GUN+aCf1t5eYfLP9U8BmeKs04h5fmJrrmYU/SYQJKQmZoi8T M9jsnBN84YGkKfxg9EhZJc1BB4pJtDkA2jSM9ARqcpyU0E8rf0v74V39SUmdePw0cOP9Wt pE62nTbP7PAav+t4UfyWojvq/QE0m2GR4kKX1TvZOH+2MUpSzUghmU5wBwpcNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKqj75N9FzDT2 for ; Mon, 01 Dec 2025 16:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 84bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 16:53:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 882821b78fae - main - kexec: Change shutdown handler priority List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 882821b78faecaffdecac8fdcd943ee2e1053ee7 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 16:53:15 +0000 Message-Id: <692dc7fb.84bc.2a12f51b@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=882821b78faecaffdecac8fdcd943ee2e1053ee7 commit 882821b78faecaffdecac8fdcd943ee2e1053ee7 Author: Justin Hibbits AuthorDate: 2025-12-01 16:50:30 +0000 Commit: Justin Hibbits CommitDate: 2025-12-01 16:53:00 +0000 kexec: Change shutdown handler priority The kexec shutdown handler should run after everything else, but before the other platform shutdown handlers. With (SHUTDOWN_PRI_DEFAULT - 150) priority it would run before anything else, including all the device shutdown handlers. Change to (SHUTDOWN_PRI_LAST - 150) where it belongs. Sponsored by: Hewlett Packard Enterprise --- sys/kern/kern_kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_kexec.c b/sys/kern/kern_kexec.c index 2efea7dcf9a7..86ee9da9a606 100644 --- a/sys/kern/kern_kexec.c +++ b/sys/kern/kern_kexec.c @@ -314,7 +314,7 @@ kern_kexec_load(struct thread *td, u_long entry, u_long nseg, if (kexec_reboot_handler == NULL) kexec_reboot_handler = EVENTHANDLER_REGISTER(shutdown_final, kexec_reboot, NULL, - SHUTDOWN_PRI_DEFAULT - 150); + SHUTDOWN_PRI_LAST - 150); } else { if (kexec_reboot_handler != NULL) EVENTHANDLER_DEREGISTER(shutdown_final, kexec_reboot_handler); From nobody Mon Dec 1 20:43:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpS3tw3z6KKjw for ; Mon, 01 Dec 2025 20:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKwpS32Hwz4NTP for ; Mon, 01 Dec 2025 20:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=70NEw8ydnGSJBbOzjFmBMfpOXiTDLYwLhl86+J44WOw=; b=BRvUeUAhgBBSTVumMYV2z2Dy6urlIz3sPw2WQeoNGGlaE1QfcSQKbyxK2J1de8SZh5Dl4C TlIQRRKGZSGosAtMC2gE2MyhzgrMq/ZCtnESYENYTl4SGSaYbbqWuC7KCOhMLVEG3xLeFc RwV8se8Al8bRqFEVa5oU4lnfJ3xGgHPGkFvP4ONNrKTbikmoQbbi9Kr9jyzx+OrfH8NXtD YQWCaGbok0do2scSDaX2CnwcZFiaOe84tMcfNqNezoo8cJzN78MEn5b+KUaa7UL3vUeEnV FEUmdjZ1tNJg+4/asHX7uQ5wL9l4aoLw9Yevn1vc/VxaIcV9pd9bX8ofyXIarg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=70NEw8ydnGSJBbOzjFmBMfpOXiTDLYwLhl86+J44WOw=; b=b6ghFjbITbbhSVJX7vkwYlF9TU6SNipPQnFmn3CY8UK3GUhOttKURbO21q3FnrFkva+yGD +cJmPat0MPpoMZQJvrzphtZPSFqIgme/z2JJ/cwsi0dmhFm51mKa2mtYTW0b1ROl9EuToz eDPuBhLTDgFGSqLqBKBgOO88CVJQ0mJ4XE7+K6SE+LwTV3+3Aav9bde9Fu9uGUruYP40rq Vz1hGgxO+F7lIwzfhsrJmP+EWanGhq5Cys2eFJU2oa0/ncvxEJzInaiM+QbCMnaID5Ailm /pel4aDlml24EuSfPUjZchp8Qnr3Tv8hVK046Hhn6ARfda7Pt7KnjoIK0328cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764621792; a=rsa-sha256; cv=none; b=Et//mu8jEdSemqm1CqjmvJ3Pq/rkyRs+UAU0C69E1IpzK0flMqBgVgrFuqdwoxOy4D4njp GmGSizMZ5/JTNksr6eeNf23ak2phf2TjX59m8a4SZomPO9Z/jJxpwpob4jKpLTlTmBaF7Z ij/0PBi9nZ0txtn6QhF4sk5owcC+/ggidbYlCGWRdZeXURN4xKajMnCKbrUhwegbKsm5Cz 4DSourak8LQPUynNqyulNHJXgpPC0ZiYywkdftW2tRIx66xpsbxkWipfbcdOl7TAT0Abcf GfKZ0ajXNOFnlvfF6LDques3momr9yaEUVVBIbLzqLKqPl44vrBM6NmyWFAt+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpS2d2tzcyg for ; Mon, 01 Dec 2025 20:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31de4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 20:43:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: ecccc9d99901 - main - evdev: Allow setting of character device ownership and access mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecccc9d99901dd874e8d122853026d7c28fa4fcf Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 20:43:12 +0000 Message-Id: <692dfde0.31de4.4c5251df@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=ecccc9d99901dd874e8d122853026d7c28fa4fcf commit ecccc9d99901dd874e8d122853026d7c28fa4fcf Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-01 20:42:14 +0000 evdev: Allow setting of character device ownership and access mode by device driver. That is required as game pad and joystick events have to be accessible by ordinary users. MFC after: 1 month --- sys/dev/evdev/cdev.c | 6 +++--- sys/dev/evdev/evdev.c | 17 ++++++++++++++++- sys/dev/evdev/evdev.h | 1 + sys/dev/evdev/evdev_private.h | 3 +++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/dev/evdev/cdev.c b/sys/dev/evdev/cdev.c index dd4115cdfc71..2f47056081d2 100644 --- a/sys/dev/evdev/cdev.c +++ b/sys/dev/evdev/cdev.c @@ -772,9 +772,9 @@ evdev_cdev_create(struct evdev_dev *evdev) make_dev_args_init(&mda); mda.mda_flags = MAKEDEV_WAITOK | MAKEDEV_CHECKNAME; mda.mda_devsw = &evdev_cdevsw; - mda.mda_uid = UID_ROOT; - mda.mda_gid = GID_WHEEL; - mda.mda_mode = 0600; + mda.mda_uid = evdev->ev_cdev_uid; + mda.mda_gid = evdev->ev_cdev_gid; + mda.mda_mode = evdev->ev_cdev_mode; mda.mda_si_drv1 = evdev; /* Try to coexist with cuse-backed input/event devices */ diff --git a/sys/dev/evdev/evdev.c b/sys/dev/evdev/evdev.c index e71f4f389d5c..4dcd6f23d338 100644 --- a/sys/dev/evdev/evdev.c +++ b/sys/dev/evdev/evdev.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -94,8 +95,14 @@ static int evdev_check_event(struct evdev_dev *, uint16_t, uint16_t, int32_t); struct evdev_dev * evdev_alloc(void) { + struct evdev_dev *evdev; - return malloc(sizeof(struct evdev_dev), M_EVDEV, M_WAITOK | M_ZERO); + evdev = malloc(sizeof(struct evdev_dev), M_EVDEV, M_WAITOK | M_ZERO); + evdev->ev_cdev_uid = UID_ROOT; + evdev->ev_cdev_gid = GID_WHEEL; + evdev->ev_cdev_mode = S_IRUSR | S_IWUSR; + + return (evdev); } void @@ -584,6 +591,14 @@ evdev_set_flag(struct evdev_dev *evdev, uint16_t flag) bit_set(evdev->ev_flags, flag); } +void +evdev_set_cdev_mode(struct evdev_dev *evdev, uid_t uid, gid_t gid, int mode) +{ + evdev->ev_cdev_uid = uid; + evdev->ev_cdev_gid = gid; + evdev->ev_cdev_mode = mode; +} + static int evdev_check_event(struct evdev_dev *evdev, uint16_t type, uint16_t code, int32_t value) diff --git a/sys/dev/evdev/evdev.h b/sys/dev/evdev/evdev.h index 2ee374f184cc..d5aa58f0ccc4 100644 --- a/sys/dev/evdev/evdev.h +++ b/sys/dev/evdev/evdev.h @@ -153,6 +153,7 @@ void evdev_support_sw(struct evdev_dev *, uint16_t); void evdev_set_repeat_params(struct evdev_dev *, uint16_t, int); int evdev_set_report_size(struct evdev_dev *, size_t); void evdev_set_flag(struct evdev_dev *, uint16_t); +void evdev_set_cdev_mode(struct evdev_dev *, uid_t, gid_t, int); void *evdev_get_softc(struct evdev_dev *); bool evdev_is_grabbed(struct evdev_dev *); diff --git a/sys/dev/evdev/evdev_private.h b/sys/dev/evdev/evdev_private.h index 661259bd2594..4c371e538598 100644 --- a/sys/dev/evdev/evdev_private.h +++ b/sys/dev/evdev/evdev_private.h @@ -111,6 +111,9 @@ struct evdev_dev char ev_shortname[NAMELEN]; char ev_serial[NAMELEN]; struct cdev * ev_cdev; + uid_t ev_cdev_uid; + gid_t ev_cdev_gid; + int ev_cdev_mode; int ev_unit; enum evdev_lock_type ev_lock_type; struct mtx * ev_state_lock; /* State lock */ From nobody Mon Dec 1 20:43:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpT4v2pz6KKgq for ; Mon, 01 Dec 2025 20:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKwpT3d71z4Nk8 for ; Mon, 01 Dec 2025 20:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STTtjDminRatFUfqyL4PzXQgB6n1Z7si4gmrw7cxols=; b=ZV6w4efYVmaUpcEoU0+pOY2t/Xjii2Ixy3HKVEsdqhwhuCJ0IbK2XjyWjMufXbu+tK+1A7 uk2DQj3HaTzvo8DJS+/e3m9jCWWuo6n72OEIb/wvTCY5ZwQFsLKqiwA0TRDfwdHEmBist3 /JS9j8ixJOPCdFtBDgFk+Hkr0u9u3qogQGwhceMIZyBRzBU5lMa79Rl3JUfBEL7GCLNpsw EyewmLfEzqUts/IOSX1V8wFhWMbM1oqlgsrTlgHHz265fudmIEyyRQ4ymyTwlv6VJuq1ma rBtVgc/siDFu2uvSskeo1a0waJ5Ot0JsEcEx4k/tdz3Ah9Fl0vpvXp7881CcRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STTtjDminRatFUfqyL4PzXQgB6n1Z7si4gmrw7cxols=; b=iA0UCKZxrkjaH5xXDhYzupTWMdnu9a7Om5ZfljY0+tc5mA5/YILidSD10mKgMD9jGWQJAZ 7BJP//5ZMyB/jMrJjnqHLzSzzUSgiVA7slGq47LI0D4nMm39+6VTaB1YY+xESgGKojwepR HxPF4HSlyXZ4EwT/HU7XLZ+lx6p56LPcRlNoGjCULIE0VXDl7hgS5sQH5i1y9L3sfTxjz9 hxxSItcAo4nMHTGiYVrYXmnkEs/0m6cI61KxjjU6NFIbJ6vPQSZU5C75QG2TT0QVIpmAVs cHlKcHoytP6O62vXXwGQ8cyrfRre2lN9a0P8W9d4CpOUzkfPyMm/v4xBvmFrjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764621793; a=rsa-sha256; cv=none; b=USQVD4rjzIxhfBzMR1OR4+YGC+Dq2gTGV/zeoBzHlADyagyMzVIdbZxpV2Tm4j8xEUwJ6z LiCyQEoddmtZSG/Fc+VYJoOtrQtwMvlliTBo4BtJBOh/nrqMI9IuB8zefuUQR1UbB/dpd/ XK5L00LMRbZGat1xvfQgTeOhMwf/VZjGmwjyNpfUdANqfX0DW+84Rg6m5HRe7WCh37WeNI 28z/7F3YZYGeHMYMDDwdYWpPZfmrH4B4mESKAjN4LWGlijkW/1a/Vve/HMETIjbUZ2gBQj j4nTyfM+eKP5YpOW4ifPjCXpGjo67dtvhxNxUZ/IaF9KHQ74XPZD9JrOU7qKiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpT39SpzdG7 for ; Mon, 01 Dec 2025 20:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31887 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 20:43:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: b6cad334e649 - main - hid: Make game controllers accessible to members of the game group List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6cad334e649f49c57da52b139de353ad9078985 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 20:43:13 +0000 Message-Id: <692dfde1.31887.556800c9@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b6cad334e649f49c57da52b139de353ad9078985 commit b6cad334e649f49c57da52b139de353ad9078985 Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-01 20:42:15 +0000 hid: Make game controllers accessible to members of the game group Their events have to be accessible by unprivileged users via e.g. libsdl. MFC after: 1 month --- share/man/man4/hgame.4 | 7 ++++--- share/man/man4/ps4dshock.4 | 5 ++++- share/man/man4/xb360gp.4 | 5 ++++- sys/dev/hid/hgame.c | 7 ++++++- sys/dev/hid/ps4dshock.c | 9 ++++++++- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/share/man/man4/hgame.4 b/share/man/man4/hgame.4 index 94ad4f5ff4a4..dd69d9ef3de1 100644 --- a/share/man/man4/hgame.4 +++ b/share/man/man4/hgame.4 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 12, 2025 +.Dd November 30, 2025 .Dt HGAME 4 .Os .Sh NAME @@ -69,8 +69,9 @@ prompt, or add it to To give user applications access to the game controllers, allow user access to the .Pa /dev/input/event* -nodes with -.Xr devfs.rules 5 . +nodes with inclusion of user in the +.Em games +group. .Sh HARDWARE The .Nm diff --git a/share/man/man4/ps4dshock.4 b/share/man/man4/ps4dshock.4 index 282a58c49e63..f48e2c07c1b7 100644 --- a/share/man/man4/ps4dshock.4 +++ b/share/man/man4/ps4dshock.4 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 19, 2020 +.Dd November 30, 2025 .Dt PS4DSHOCK 4 .Os .Sh NAME @@ -55,6 +55,9 @@ The device presents the game controller as a .Ar evdev type device. +It is accessible to members of the +.Em games +group. .Sh SYSCTL VARIABLES Next parameters are available as .Xr sysctl 8 diff --git a/share/man/man4/xb360gp.4 b/share/man/man4/xb360gp.4 index 4e8d4b65fcfd..1ff42e970858 100644 --- a/share/man/man4/xb360gp.4 +++ b/share/man/man4/xb360gp.4 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 16, 2020 +.Dd November 30, 2025 .Dt XB360GP 4 .Os .Sh NAME @@ -56,6 +56,9 @@ The device presents the game controller as a .Ar evdev type device. +It is accessible to members of the +.Em games +group. .Sh SYSCTL VARIABLES The following variable is available as both .Xr sysctl 8 diff --git a/sys/dev/hid/hgame.c b/sys/dev/hid/hgame.c index b074f6145d0e..8dde6b5550c9 100644 --- a/sys/dev/hid/hgame.c +++ b/sys/dev/hid/hgame.c @@ -33,8 +33,10 @@ #include #include +#include #include #include +#include #include #include @@ -170,8 +172,11 @@ hgame_final_cb(HIDMAP_CB_ARGS) { struct evdev_dev *evdev = HIDMAP_CB_GET_EVDEV(); - if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) + if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) { evdev_support_prop(evdev, INPUT_PROP_DIRECT); + evdev_set_cdev_mode(evdev, UID_ROOT, GID_GAMES, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + } /* Do not execute callback at interrupt handler and detach */ return (ENOSYS); diff --git a/sys/dev/hid/ps4dshock.c b/sys/dev/hid/ps4dshock.c index d3c6b3eeadf9..1cd9cb13bad3 100644 --- a/sys/dev/hid/ps4dshock.c +++ b/sys/dev/hid/ps4dshock.c @@ -37,10 +37,12 @@ #include #include +#include #include #include #include #include +#include #include #include @@ -806,8 +808,11 @@ ps4dshock_final_cb(HIDMAP_CB_ARGS) { struct evdev_dev *evdev = HIDMAP_CB_GET_EVDEV(); - if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) + if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) { evdev_support_prop(evdev, INPUT_PROP_DIRECT); + evdev_set_cdev_mode(evdev, UID_ROOT, GID_GAMES, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + } /* Do not execute callback at interrupt handler and detach */ return (ENOSYS); @@ -886,6 +891,8 @@ ps4dsacc_final_cb(HIDMAP_CB_ARGS) if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) { evdev_support_event(evdev, EV_ABS); evdev_support_prop(evdev, INPUT_PROP_ACCELEROMETER); + evdev_set_cdev_mode(evdev, UID_ROOT, GID_GAMES, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); } /* Do not execute callback at interrupt handler and detach */ return (ENOSYS); From nobody Mon Dec 1 20:43:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpV6zKXz6KKgy for ; Mon, 01 Dec 2025 20:43:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKwpV4kDtz4Nm4 for ; Mon, 01 Dec 2025 20:43:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49+oY1BB3ye+kGXn2tJqZ7sUrbvqXaR+6+xAhrNjF6g=; b=M7dSTCFraejPlafHsEQToNF9SxCXTG95P6iKJIcJM4/FynqiAoxQyWDbBLlEr9OzRBoTh5 3k+uybyoKeMx19TLdqSCp1TxjUXwEuTXHTrv4KbgHYlnP0yZdK5d1jM9wK0qZoTI3fh33c d0bGSpVAq3BUcmd5od7b1W2vaAwEb/dNeIsFg7FfngRDuUM27UoYydyC3kgJZRHGAjFgEJ q26DPInt528Vw2Z0Ep+IiEvyLOV+5EdURVrHHKiONTcwxxwUb0nLLaAgSJ1r4m+GflpaMY QYYD+C7feRFm//53rf2B3jFXwPWjVSDtUJHfRYLrxiGSXc/YEdyLcorEEA/4EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49+oY1BB3ye+kGXn2tJqZ7sUrbvqXaR+6+xAhrNjF6g=; b=F+e00fIg3fLst4n7lsDiJ71s98jn2tgqTR7PIcvPnO7CPqzmQAg+Vhd1bzCLaDRupF+uu/ rz6TaJFgbxMFzMFytl7sTQoLcD2+iB2mrfXS1Il2fB37gQWhWlSTOZjwJiMzcgZNyB4BPO S+jzilIahsYpQX3sRoRQ8nWa2H6GZMPrLNS8iZcc5jiV+gs3ubqQCI004av+2rfaU+Mudh Z4u6I2HyAwFRGf1MF5/m6rg0hoq9S4Om9NJLuxgGbzgSr1vZZj3bKtHdoSSINVNbARZPgk neG6AZzWCllChY9ZA1ELohKIJeirPMbYClspacm9rnksaPQGNjy4hvjI8Q+UDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764621794; a=rsa-sha256; cv=none; b=a8OC3FsSnCOUGJX2GeKwuks8XEdY4ufbaD5o+OCBjEUbmvW47xHiVZv47j1rDAOdDts6V9 KrPyBWGqo+GzLJEZXwHpFHYrIket+p9MisEMj1pliHgQfpQWPZ3WbGOeIQtIXtPJwFKsQv MGeSqgBIt99II0B+b69CnYKgUV00JUQ49TRQvr0dVMNO8GfFkLQEBtUq7n2Vks+IOKash4 D5jkI8TB1NUznHPEJ4RlXxH5LL15oiVR64Kq//wXQd3u/aBHHgCl/ZGJKGCCPYdZqT+IVp D3ejFG8R4Ghp6zUipg7S9E1lGKAP9h3+7zg1OEKfH5ASu7VpdVJ0aOrQsuLlhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpV3zv7zdG9 for ; Mon, 01 Dec 2025 20:43:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 305b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 20:43:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Robert Wahlberg From: Vladimir Kondratyev Subject: git: e3201cec8381 - main - psm: Fix three finger tap on elantech v4 touchpads List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3201cec8381c0582374f93991eff4a71bb95e9b Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 20:43:14 +0000 Message-Id: <692dfde2.305b9.6c8cabfe@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=e3201cec8381c0582374f93991eff4a71bb95e9b commit e3201cec8381c0582374f93991eff4a71bb95e9b Author: Robert Wahlberg AuthorDate: 2025-12-01 20:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-01 20:42:15 +0000 psm: Fix three finger tap on elantech v4 touchpads Fix an issue where a three finger tap would generate additional events when fingers moved slightly during the tap. Signed-off-by: Robert Wahlberg Pull Request: https://github.com/freebsd/freebsd-src/pull/1792 Reviewed by: wulf MFC after: 1 month --- sys/dev/atkbdc/psm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 137758b104d3..d36396df0fa0 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -4666,6 +4666,13 @@ proc_elantech(struct psm_softc *sc, packetbuf_t *pb, mousestatus_t *ms, mask = sc->elanaction.mask; nfingers = bitcount(mask); + /* The motion packet can only update two fingers at a time. + * Copy the previous state to get all active fingers. */ + for (id = 0; id < ELANTECH_MAX_FINGERS; id++) + if (sc->elanaction.mask & (1 << id)) + f[id] = sc->elanaction.fingers[id]; + + /* Update finger positions from the new packet */ scale = (pb->ipacket[0] & 0x10) ? 5 : 1; for (i = 0; i <= 3; i += 3) { id = ((pb->ipacket[i] & 0xe0) >> 5) - 1; From nobody Mon Dec 1 20:43:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpX1fK3z6KKjx for ; Mon, 01 Dec 2025 20:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKwpW5BS6z4NtV for ; Mon, 01 Dec 2025 20:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TVeFDkxzj+su1LlyUPxSitPe0i025THyYpIOMFf/E1A=; b=O2I6IqIjfkmKG7EPwTqrzupMC58X07UA890E0hD4ndhHc0bQhZ72HCWkGmMEO8pOU+e8Mt ghzj8QjPf+kGQaErCRE4szwXd661lN7r+2OvDMZkeH91im6VOr2rtCmxQG5ya0vFVMKEnJ +0CWnx7jIgaPiyPMWqIkDDbCP9FfC73OE6W7a4NeA3Sqle/Za+muV+bxYFETJj2ZJIjVm3 v3q2GUBOh+6z27iHGVlEY1SLMQT6w4+bna+bH516aIjLkTY+7ZDwZxQDRgugiPAq/sLv2l 39SprbRnh3YbVAQZY8r9+GSq35QAnz3SKQgUDziSUlZufUsZQSHweHlR7aLcww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TVeFDkxzj+su1LlyUPxSitPe0i025THyYpIOMFf/E1A=; b=IOkDraEY7Se+ry6zoNZ/7H8wFvHg3Qf9WzpF5kl8dXzX2Ju5Hq38IkVFvo9psm8EKBTtX2 cvxYM+rCIqzMezmnJDz5NSOh7xJaihFSBSI4ePNkieEYBBswth1iPSBOZqngnM4w35f1bH 5rhb20RrM4WmEvtBls8nyzAT5thy59uhC0F/bucbjBxOvhgFuHxLewUssCJAOY5OX66qOE Jav/TQetybcZDyzBPBLABiN/6PFh88/Kfln1PzmeFeW8XDlDeeLf1VnZrPFQLw8+TkYv51 xBw6AajIEDb6j4g2v688IIaW1ewJHgvioLW03KSvrOU74z8pDA05DKiVUAGtIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764621795; a=rsa-sha256; cv=none; b=IOH8fbweiQKRC1qbcTxUHG2DFwkaIlLkGi+PUWQchGjaHIEomhrMcGHhXh2q+IkdA7YwDa 4/2DN+XU3VGlbPF51lCFMNMha7b63o/M9+IJj3bffM3SZgQryXf+kDmeJ8P9bdCQn2ULp8 4ET73Xy8+KHUnlqnJGMgf1xJr/7ZHCX4Zw+/tS0A6lA43MqwxqNwQkI2mu05xSwStzA5sU 4vhLpGdrNk3t2xZQYCbgdND+uO3Kxsp/SwLW650qN+3ryJxXzUki06qzmTy3EWxVIxdiqo D3BSiJPEXa2kUPlq3a4CS9dBm/NrgoPn0Ng/asLhCbPBXlRDn4gk+RNSaKpq8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpW4nL7zcqC for ; Mon, 01 Dec 2025 20:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31989 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 20:43:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 8d9a5d44b155 - main - evdev: Sync event codes with Linux kernel 6.18 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d9a5d44b155af7123893a6948ad7e86b48c57b3 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 20:43:15 +0000 Message-Id: <692dfde3.31989.779fec7b@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=8d9a5d44b155af7123893a6948ad7e86b48c57b3 commit 8d9a5d44b155af7123893a6948ad7e86b48c57b3 Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-01 20:42:15 +0000 evdev: Sync event codes with Linux kernel 6.18 MFC after: 1 month --- sys/dev/evdev/input-event-codes.h | 28 ++++++++++++++- sys/dev/evdev/input.h | 73 +++++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 30 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 59eb8e104c87..81c88ec86b9b 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -39,6 +39,7 @@ #define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ #define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ #define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ +#define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */ #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) @@ -531,6 +532,7 @@ #define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ #define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ #define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ +#define KEY_LINK_PHONE 0x1bf /* AL Phone Syncing */ #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -612,8 +614,14 @@ #define BTN_DPAD_LEFT 0x222 #define BTN_DPAD_RIGHT 0x223 +#define BTN_GRIPL 0x224 +#define BTN_GRIPR 0x225 +#define BTN_GRIPL2 0x226 +#define BTN_GRIPR2 0x227 + #define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ #define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ +#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */ #define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ #define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ @@ -629,10 +637,24 @@ #define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ #define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ +#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ +#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ +/* + * Keycodes for hotkeys toggling the electronic privacy screen found on some + * laptops on/off. Note when the embedded-controller turns on/off the eprivacy + * screen itself then the state should be reported through drm connecter props: + * https://www.kernel.org/doc/html/latest/gpu/drm-kms.html#standard-connector-properties + * Except when implementing the drm connecter properties API is not possible + * because e.g. the firmware does not allow querying the presence and/or status + * of the eprivacy screen at boot. + */ +#define KEY_EPRIVACY_SCREEN_ON 0x252 +#define KEY_EPRIVACY_SCREEN_OFF 0x253 + #define KEY_KBDINPUTASSIST_PREV 0x260 #define KEY_KBDINPUTASSIST_NEXT 0x261 #define KEY_KBDINPUTASSIST_PREVGROUP 0x262 @@ -773,6 +795,9 @@ #define KEY_KBD_LCD_MENU4 0x2bb #define KEY_KBD_LCD_MENU5 0x2bc +/* Performance Boost key (Alienware)/G-Mode key (Dell) */ +#define KEY_PERFORMANCE 0x2bd + #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 #define BTN_TRIGGER_HAPPY2 0x2c1 @@ -932,7 +957,8 @@ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ #define SW_MACHINE_COVER 0x10 /* set = cover closed */ -#define SW_MAX 0x10 +#define SW_USB_INSERT 0x11 /* set = USB audio device connected */ +#define SW_MAX 0x11 #define SW_CNT (SW_MAX+1) /* diff --git a/sys/dev/evdev/input.h b/sys/dev/evdev/input.h index 3b87101da75f..ce0fb616a3df 100644 --- a/sys/dev/evdev/input.h +++ b/sys/dev/evdev/input.h @@ -142,6 +142,8 @@ struct input_keymap_entry { #define BUS_RMI 0x1D #define BUS_CEC 0x1E #define BUS_INTEL_ISHTP 0x1F +#define BUS_AMD_SFH 0x20 +#define BUS_SDW 0x21 /* * MT_TOOL types @@ -203,20 +205,6 @@ struct ff_condition_effect { int16_t center; /* center of dead zone */ }; -/* - * Force feedback periodic effect types - */ - -#define FF_SQUARE 0x58 -#define FF_TRIANGLE 0x59 -#define FF_SINE 0x5a -#define FF_SAW_UP 0x5b -#define FF_SAW_DOWN 0x5c -#define FF_CUSTOM 0x5d - -#define FF_WAVEFORM_MIN FF_SQUARE -#define FF_WAVEFORM_MAX FF_CUSTOM - struct ff_periodic_effect { uint16_t waveform; uint16_t period; /* ms */ @@ -233,21 +221,14 @@ struct ff_rumble_effect { uint16_t weak_magnitude; /* magnitude of the light motor */ }; -/* - * Force feedback effect types - */ - -#define FF_RUMBLE 0x50 -#define FF_PERIODIC 0x51 -#define FF_CONSTANT 0x52 -#define FF_SPRING 0x53 -#define FF_FRICTION 0x54 -#define FF_DAMPER 0x55 -#define FF_INERTIA 0x56 -#define FF_RAMP 0x57 - -#define FF_EFFECT_MIN FF_RUMBLE -#define FF_EFFECT_MAX FF_RAMP +struct ff_haptic_effect { + uint16_t hid_usage; + uint16_t vendor_id; + uint8_t vendor_waveform_page; + uint16_t intensity; + uint16_t repeat_count; + uint16_t retrigger_period; +}; struct ff_effect { uint16_t type; @@ -262,9 +243,41 @@ struct ff_effect { struct ff_periodic_effect periodic; struct ff_condition_effect condition[2]; /* One for each axis */ struct ff_rumble_effect rumble; + struct ff_haptic_effect haptic; } u; }; +/* + * Force feedback effect types + */ + +#define FF_HAPTIC 0x4f +#define FF_RUMBLE 0x50 +#define FF_PERIODIC 0x51 +#define FF_CONSTANT 0x52 +#define FF_SPRING 0x53 +#define FF_FRICTION 0x54 +#define FF_DAMPER 0x55 +#define FF_INERTIA 0x56 +#define FF_RAMP 0x57 + +#define FF_EFFECT_MIN FF_HAPTIC +#define FF_EFFECT_MAX FF_RAMP + +/* + * Force feedback periodic effect types + */ + +#define FF_SQUARE 0x58 +#define FF_TRIANGLE 0x59 +#define FF_SINE 0x5a +#define FF_SAW_UP 0x5b +#define FF_SAW_DOWN 0x5c +#define FF_CUSTOM 0x5d + +#define FF_WAVEFORM_MIN FF_SQUARE +#define FF_WAVEFORM_MAX FF_CUSTOM + /* * force feedback device properties */ @@ -272,6 +285,8 @@ struct ff_effect { #define FF_GAIN 0x60 #define FF_AUTOCENTER 0x61 +#define FF_MAX_EFFECTS FF_GAIN + #define FF_MAX 0x7f #define FF_CNT (FF_MAX+1) From nobody Mon Dec 1 20:52:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKx1b0vxJz6HchK for ; Mon, 01 Dec 2025 20:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKx1b0FPqz3C2y for ; Mon, 01 Dec 2025 20:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764622371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RS6qP0TO3+qdeurrI6vrhkbLyvhrXie8I3s8zU3MBb8=; b=U3tv7K9Utp6Qv8Xqoa7HHtmf8WoQyyokrqaOlCDsP8w8IeHHAa+anqFz1+vVGNZtq/8CrH PPoftJcnHjU1lXtS2RBafrAjZdWc1hwq9gmCiK0TbZdDGVZlqefS7dVXXCzjJnKF1hkyQM +H+3BKexfAtBIClO/Js/4ebZ0QuZqKno+rQeUu546nEK8A7dOVdqUAyVrF56MdnJA2BCjH ljKXLeq3vaWj7Gbe4q++Q/rpPTwugAuJfWXsnSXRGktEu37D3uxEG0cAHGFX0OsWmG5wYz JTpP0dBXsct0kw6GLpwo2Z9bSP7V9fg5XCfUMyXitA3VoGIt4O5nO9taI/0fJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764622371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RS6qP0TO3+qdeurrI6vrhkbLyvhrXie8I3s8zU3MBb8=; b=gYH5G4z21b1jBOsYQPGSzmD9BBtoyMzDKv7IDbn7kEABwS93bSUPrHphl+UrONK1YtBCPR fCBEqCK0OJGZrCoV6AgyCj62jHGBWKwmzm12w/TyvHizbxL/bTWRqs0WVgxh2zgYMq9kYy Jh0VRLf159v/V5OjwE2ooF/dkMelEiltI4/29PNQ1imOY1g0IPlyjwMrITj6Zvu4SjhRlw DtlIBiYrWhSJarpRy9y7zrDuH7dAw6Bc+6WyGO/l3PYK394jXWat7UYhwp6phDplSvbKB4 XL7q8jfaQ1TW7bmsXNJKVbTaQdfiu+GankRRUfRSIMhaxMl2Ct93FJ11k31LHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764622371; a=rsa-sha256; cv=none; b=sfMweIQrHPX1PCtlllNC1k2QhvDSpq9Kxi5f21klkM/+lcXzNaUH+j56XFFWaCUsnJ8+0J GBcWawhwVwZwX1h9POPjx9XJzCYgSaoM5o3BnX5g79wKWQYHlI3V/s4DQ1htJmDgbfGOJH 9MnWHOHjJCGjsllRuxGaqARMa//ARM/qFEXgAaLhgyPB207nI0SSqKCrsyrlmjSsuU6LSX 548zn3iAT5dxgovObKWVhFljeWi7enneuJbr/48QKc2l6rf9LS6HvanH8BzIRMlTJ0/lYS U2001cKfWg7lH2+EmFsfaqD0dbwuC0Py9+rYcU8A5qcTPKg06JQFJW6TNY473g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKx1Z6Tz9zdGX for ; Mon, 01 Dec 2025 20:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 324d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 20:52:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Peek Subject: git: 732b4aa05d78 - main - ctfmerge: fix segfault when building on macOS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 732b4aa05d78ca6831d02e67a43f34ad104f4f01 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 20:52:50 +0000 Message-Id: <692e0022.324d6.525dccf4@gitrepo.freebsd.org> The branch main has been updated by mp: URL: https://cgit.FreeBSD.org/src/commit/?id=732b4aa05d78ca6831d02e67a43f34ad104f4f01 commit 732b4aa05d78ca6831d02e67a43f34ad104f4f01 Author: Mark Peek AuthorDate: 2025-12-01 20:50:24 +0000 Commit: Mark Peek CommitDate: 2025-12-01 20:50:24 +0000 ctfmerge: fix segfault when building on macOS The barrier code was using semaphores which have been deprecated in macOS and not working at all, causing a race condition. Since macOS does not have pthread_barrier_*(), this change uses a condition variable instead. PR: 290958 Reported by: wosch MFC after: 2 weeks Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D54018 --- cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c | 26 +++--------------------- cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h | 9 ++------ 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c index c0719620dbde..e1f54e994ce3 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c @@ -38,9 +38,6 @@ */ #include -#ifdef illumos -#include -#endif #include #include "barrier.h" @@ -49,12 +46,7 @@ void barrier_init(barrier_t *bar, int nthreads) { pthread_mutex_init(&bar->bar_lock, NULL); -#ifdef illumos - sema_init(&bar->bar_sem, 0, USYNC_THREAD, NULL); -#else - sem_init(&bar->bar_sem, 0, 0); -#endif - + pthread_cond_init(&bar->bar_cv, NULL); bar->bar_numin = 0; bar->bar_nthr = nthreads; } @@ -65,26 +57,14 @@ barrier_wait(barrier_t *bar) pthread_mutex_lock(&bar->bar_lock); if (++bar->bar_numin < bar->bar_nthr) { + pthread_cond_wait(&bar->bar_cv, &bar->bar_lock); pthread_mutex_unlock(&bar->bar_lock); -#ifdef illumos - sema_wait(&bar->bar_sem); -#else - sem_wait(&bar->bar_sem); -#endif return (0); - } else { - int i; - /* reset for next use */ bar->bar_numin = 0; - for (i = 1; i < bar->bar_nthr; i++) -#ifdef illumos - sema_post(&bar->bar_sem); -#else - sem_post(&bar->bar_sem); -#endif + pthread_cond_broadcast(&bar->bar_cv); pthread_mutex_unlock(&bar->bar_lock); return (1); diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h index babf2e64e33f..138386f8ed46 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h @@ -33,12 +33,7 @@ * APIs for the barrier synchronization primitive. */ -#ifdef illumos -#include -#else -#include -typedef sem_t sema_t; -#endif +#include #ifdef __cplusplus extern "C" { @@ -48,7 +43,7 @@ typedef struct barrier { pthread_mutex_t bar_lock; /* protects bar_numin */ int bar_numin; /* current number of waiters */ - sema_t bar_sem; /* where everyone waits */ + pthread_cond_t bar_cv; /* where everyone waits */ int bar_nthr; /* # of waiters to trigger release */ } barrier_t; From nobody Mon Dec 1 21:09:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKxNw5RCkz6HfZQ for ; Mon, 01 Dec 2025 21:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKxNw4sYRz3DqR for ; Mon, 01 Dec 2025 21:09:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764623376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AhXqzjL/4kEfQKHPkLrCTamfFwzo8ZxCzQ5Aa+d4U8w=; b=cNUqzDJwgAP1F2cPc+1kYbReH+6sKQECRH8nBBCqnGidx9giIogHzr5khgAFPAAp4cJ3nh XtGhJ+DoZp/US2ZaWL5aiZYb952WMWYrgKv4rMbR8BNPvMJUrLLI0DbQuIxrL7u7uGHej2 idKWOpeXpHQhs8NJX/QRswCDObqqwr9ZS4RTzFXYVRmB26n1NIrQbJloiwVQ64Vk+m7a6/ XJgx3ZPJgBRuf2fJ+7uU1BexpqQk+Nk7QE5gRVUntLEjIshJXTahOCGGj9pyP1rqV18dnw EmVSbgwAqrk68TF7Kvl/C5GJ7sMwPQOCKc7CI7BrrYNdjWhn1f6gAwRG6SafUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764623376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AhXqzjL/4kEfQKHPkLrCTamfFwzo8ZxCzQ5Aa+d4U8w=; b=Qe+VjmCvXJk54WnZu9PclKN0KW9jG5S6d6rH3hPn7iGg3hj4UcRE9teqoNWwfWbXY0xDme 6fhVGLw08xIvnacwT8gxEtS795zqtIYFSy+1aqUxjtQPbsxEgR5+7Rvhn09Qz167LZ7V+S Z97cD46OHGuZTbfCMkbQxZ0r21Z6V8MKSHOesKlZy2Oaean+IOxi/HSFYywlh9o7nh7Ptr KGCqGz0nUW0E+e7QXXSGfFAFSZLFRq9l9B6bBziVMiDNQDV8n6hjre++RqdGXkwO56jDgd ql7fxRHCz4TuNYyn+CNQsdgLAtCQplGekXsSC5JYwZ6uaJxMonl5KKUB/e+BrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764623376; a=rsa-sha256; cv=none; b=u83R0UFmYQfbgw7M9D4COiTErg/HD5iIazFuKmcun/MlYfTAhUjWO/iFPIKZdmsHkn3hmr GqI016MOs1Bl6EWA+y2h201CMd9kkAztbTD3U0s3d9nsv12EK6xR9dkPH17+3A1cibBRPR tZl0tkHsCz0+z3BdkahOvv81olGVhf+bscPVut8b7P46M/+ehy1Tf7T6hucqoIBmR9BvZv vQ5nTha8ZbluEuzWfbgCqjxnZEVcbIzfiwbibAdYVVGfcS5DSJ5E4y1i6rMlIe6CaEqFBG nKHl8U+Qegv1JhmWW11mlIK5A/Hi3rnbIjMfzHpDl7to0li7dbmO220lrfkUxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKxNw48YFzdC5 for ; Mon, 01 Dec 2025 21:09:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33592 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 21:09:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: dc6f609685a9 - main - msconvd(8): Drop mentions of Bus/InPort mouse support in manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc6f609685a9bc41c67d3c1219311e0096982865 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 21:09:31 +0000 Message-Id: <692e040b.33592.1e1660d5@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=dc6f609685a9bc41c67d3c1219311e0096982865 commit dc6f609685a9bc41c67d3c1219311e0096982865 Author: Vladimir Kondratyev AuthorDate: 2025-12-01 21:09:00 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-01 21:09:00 +0000 msconvd(8): Drop mentions of Bus/InPort mouse support in manual page mse(4) was removed long ago. MFC after: 1 month --- usr.sbin/moused/msconvd/msconvd.8 | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/usr.sbin/moused/msconvd/msconvd.8 b/usr.sbin/moused/msconvd/msconvd.8 index 17434ecb9b60..b5d738d5b5ed 100644 --- a/usr.sbin/moused/msconvd/msconvd.8 +++ b/usr.sbin/moused/msconvd/msconvd.8 @@ -160,10 +160,11 @@ information are: .It Ar port Port (device file) name, i.e.\& .Pa /dev/cuau0 , +.Pa /dev/ums0 and .Pa /dev/psm0 . .It Ar if -Interface type: serial, bus, inport or ps/2. +Interface type: serial or ps/2. .It Ar type Protocol type. It is one of the types listed under the @@ -243,12 +244,6 @@ always choose or .Ar ps/2 , regardless of the brand and model of the mouse. -Likewise, if your -mouse is attached to the bus mouse port, choose -.Ar auto -or -.Ar busmouse . -Serial mouse protocols will not work with these mice. .Pp For the USB mouse, the protocol must be .Ar auto . @@ -304,14 +299,6 @@ Interlink VersaPad protocol. GTCO Digipad protocol. .El .Pp -For the bus and InPort mouse: -.Bl -tag -compact -width mousesystemsxxx -.It Ar busmouse -This is the only protocol type available for -the bus and InPort mouse and should be specified for any bus mice -and InPort mice, regardless of the brand. -.El -.Pp For the PS/2 mouse: .Bl -tag -compact -width mousesystemsxxx .It Ar ps/2 @@ -402,10 +389,6 @@ There is rule of thumb: .Pp .Bl -enum -compact -width 1.X .It -The bus and InPort mice always use -.Ar busmouse -protocol regardless of the brand of the mouse. -.It The .Ar ps/2 protocol should always be specified for the PS/2 mouse From nobody Mon Dec 1 21:31:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKxt04J9qz6Hhyx for ; Mon, 01 Dec 2025 21:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKxt03KjVz3H4M for ; Mon, 01 Dec 2025 21:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7yYwbrkUJXNkhf77Rbo3scshvwWZnyS5s8oVsE39QY=; b=C5foKIOR7YbiXrpQYmyVf37KaSV+S+KOtvgYkAkocIfTr1aHNF/Pkc+koqY6oDyBtqHokO 0d5Iz0SwkDB58wJuSpAxphykTGjfVeKG6ofyRuv6uJMLQu4IfWz4U1crqi8RJo1sNPrRZ6 d+JmqHZD5bMhF+520WTFljLUQyLXquAjLPpuaBxBFa5rYK5oKLkVJA86KiCO2/U4oCgCWc v4kF6ZBOjhCdacd78BfXZV2oOhcHP0a6qk+vwqa3SHBWxOZI8gkjv7JGbgKFVijl7U+tNy ItIvipmkkBf4Y8TNUaF6SnmGfLMzVHDDsDdK8s5IuOB6eUJwFxM4g3y9il+aag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f7yYwbrkUJXNkhf77Rbo3scshvwWZnyS5s8oVsE39QY=; b=Oc4Pw0gQSVplNh4hsPXQTKLlWMc0Mb2u0KTwSix+fRoSGLohnSVbrAbA8U4hB3XdYNenXZ IKkYCtiGuyfjQxfRpJ91WrjO9TIn6y5dT1m3nMW8HRi6DHO3xbmgv/78SqVSPURri4rKNP K317kFWRsrrS3FGO7VQpxw4/bhKWIQVjGK3pJtTnGP8pA44t9j65BVf7a1TXBh/UNUWdvy ce/Ood752k4dGJJdW8tiVUW82Pc5QNqpfh+za/1eEmlfufTWE5AvIXHvAP3d2yyUZ7hTg/ 0lCzHvTR8MCM3Lk0klflvuyubMRC3kzusiRgy+Dkyrv3YTbf8ZWcw5gKVG9B1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764624680; a=rsa-sha256; cv=none; b=AksjuZrqoIALV65UZ1h079KOYYldKd/Mx9zJkuhuvslvUGtFdoxUX7ElCvsj0Y03TWvdcP sF9R1ht9E/QNcJr4fGZVQ6FxPGLosPdmqIUQy3XrCsqOoUAcNdezmUOM2LCn3yBMrL0jox lf8TFSYXxUDGqKytzprKOm/EB5Zdk+GPVgnwc+tX8QPkm3lxSha+NxjxUtod2mV05JbOf9 mniDVhgifA/F8AvyKFeyAc93O9lNyX6NTbJsNDzdZOaY1CQKtp7jLDRS0004xRmFsQgzVx ELkt1cgGh9IsG1MyucysmuTDIBJ+wDkCDPTcRU7FTJi5hXtVQdk2rgB4+Z8RhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKxt02cl8zdpp for ; Mon, 01 Dec 2025 21:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 21:31:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: d6f1acf94d3a - main - pf: use correct sized variables in pf_change_icmp() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d6f1acf94d3a1b310318ea3ff6c4f4b33bc8e85d Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 21:31:20 +0000 Message-Id: <692e0928.365ed.2ee91c72@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d6f1acf94d3a1b310318ea3ff6c4f4b33bc8e85d commit d6f1acf94d3a1b310318ea3ff6c4f4b33bc8e85d Author: Kristof Provost AuthorDate: 2025-12-01 10:06:24 +0000 Commit: Kristof Provost CommitDate: 2025-12-01 21:30:21 +0000 pf: use correct sized variables in pf_change_icmp() We're updating 16-bits checksums here, so should use a 16-bit integer, not a 32-bit one. No functional change. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 74d2182fe77b..2f09d47dc6e1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3531,7 +3531,7 @@ pf_change_icmp(struct pf_addr *ia, u_int16_t *ip, struct pf_addr *oa, /* Change inner protocol port, fix inner protocol checksum. */ if (ip != NULL) { u_int16_t oip = *ip; - u_int32_t opc; + u_int16_t opc; if (pc != NULL) opc = *pc; @@ -3547,7 +3547,7 @@ pf_change_icmp(struct pf_addr *ia, u_int16_t *ip, struct pf_addr *oa, switch (af) { #ifdef INET case AF_INET: { - u_int32_t oh2c = *h2c; + u_int16_t oh2c = *h2c; *h2c = pf_cksum_fixup(pf_cksum_fixup(*h2c, oia.addr16[0], ia->addr16[0], 0), From nobody Mon Dec 1 21:31:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKxt16xwzz6Hj0s for ; Mon, 01 Dec 2025 21:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKxt146lyz3H2N for ; Mon, 01 Dec 2025 21:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=deoyrXGU3HXZQwcGPO89faoHW+MD84k/Mtr34EIs0KY=; b=ye7/iNji4450PidDeaEpXYI3MmO9d95EI4BPRZtQMoAzqa6NXjrdfZkC2CEnGZPrpgCPHp qSp95zI5EfTv8B7VKVy3iqbzcM0JozAaXkU3tAABRh+cEaXqhi+hejKtu4aF/hQarrhQp7 xbQLFv6RaGbACwhJYHnZaOR+5EGQY2ZOxiXLsdwfdgHk8NFL9ot8Rmt0i0klrHzw2DDTYu uuy9ILEWcvdDwPtLYAbT+42JiXiCJ/pWHUDCoALfqygnA7GrLEcGdHHRpG4eNpuoqSIZ6W oslhR+A36lr4yfGhpuKhEc0Ixtpgcjeu12Jx3oIhkQS3nYSS0NFsCNLxePruNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=deoyrXGU3HXZQwcGPO89faoHW+MD84k/Mtr34EIs0KY=; b=MYdaA8oHN733ELx174iYNWJezasH4z3rax23u/4dWmvEhcp9N83YHRzdYdODhpdLbPH5dA VRLWnk8O+NEkqqOK10+7w5r+BOfQw2nSzyCsAJCzhlf/AjFB9+pqfh5JfaEhMpwZkTq8q7 gqecmatj1evu0bzB5RgHaD/3l3+MTibjGplfPtpOgdoU/0n7Q6ikneQArAwtcxI5vZwOD7 rp68b9hp4AC+AdlXO01KoBt4gGy3+ON5xrFYJJLpswY61WkpeppG5Hw5qE3dRtZXavU59M oW21GkWBn439a7hwBhtcjFrIBP+LNo0+4vhNbkjMvPUlBGasvgIliKqOYg5+3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764624681; a=rsa-sha256; cv=none; b=f+cVFXOyfwL/lYlkcQVOBSkXM1IohHTIkzjFx5oFGpRIdmP8iPTERRGC+Kpwxr3KPdenWo wbYAExhrx6dj5rGl98ryfED3aT1xmn1/WmcTIYTZvHNIB1OjqifxGDKtCrmBM8QpVJBVGb 20yx2ZJjY/DCNAnk/lNxudlrrKws7LKxCuOWNMZAN2uCtO17wZk0GksY8ncsCdMZ9Po45H DTB3DMHEuTtnNSQ5Xk72tPov+QTAHGw/pP3rG50o3qKqFnVnLg25VakiM7NMhmYrpSfpMm sw1xVFvg/bNEsGRB4ZQ5tXgzEaqNibq3PMX2vDYbsLLbsCddQl0meUCBZDk8XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKxt13QfNzdyW for ; Mon, 01 Dec 2025 21:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3552a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 21:31:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 7a283c40188f - main - pfctl: restore '-Tload -f pf.conf' functionality List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 7a283c40188ff7b0a4bae1a47bbd9ecc17ded132 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 21:31:21 +0000 Message-Id: <692e0929.3552a.7b0a98e@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7a283c40188ff7b0a4bae1a47bbd9ecc17ded132 commit 7a283c40188ff7b0a4bae1a47bbd9ecc17ded132 Author: Kristof Provost AuthorDate: 2025-12-01 15:05:09 +0000 Commit: Kristof Provost CommitDate: 2025-12-01 21:30:30 +0000 pfctl: restore '-Tload -f pf.conf' functionality Allow only tables to be loaded from a file, rather than everything (i.e. including options, rules). Add a test case for this. PR: 291318 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 3 ++- tests/sys/netpfil/pf/table.sh | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index ae3599b9e4e5..5ab4687dd35f 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -3406,7 +3406,8 @@ main(int argc, char *argv[]) if ((opts & PF_OPT_NODNS) && (opts & PF_OPT_USEDNS)) errx(1, "-N and -r are mutually exclusive"); - if ((tblcmdopt == NULL) ^ (tableopt == NULL)) + if ((tblcmdopt == NULL) ^ (tableopt == NULL) && + (tblcmdopt == NULL || *tblcmdopt != 'l')) usage(); if (tblcmdopt != NULL) { diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 6761ce652beb..0b2b56592404 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -808,6 +808,40 @@ replace_cleanup() pft_cleanup } +atf_test_case "load" "cleanup" +load_head() +{ + atf_set descr 'Test pfctl -T load (PR 291318)' + atf_set require.user root +} + +load_body() +{ + pft_init + + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + echo -e "table persist { 172.16/12 }\nblock\npass in from \n" \ + | atf_check -s exit:0 jexec alcatraz pfctl -Tload -f - + + atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 + + atf_check -s exit:0 -o not-match:"block" \ + jexec alcatraz pfctl -sr + atf_check -s exit:0 -o match:'172.16.0.0/12' \ + jexec alcatraz pfctl -Tshow -t private +} + +load_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4_counters" @@ -827,4 +861,5 @@ atf_init_test_cases() atf_add_test_case "show_recursive" atf_add_test_case "in_anchor" atf_add_test_case "replace" + atf_add_test_case "load" } From nobody Mon Dec 1 21:31:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKxt33r0xz6Hj0v for ; Mon, 01 Dec 2025 21:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKxt25m14z3HDC for ; Mon, 01 Dec 2025 21:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xor8iKcPQNa6g8Hzu4FGn3zH/vhOb5mqbpVdToJc7LI=; b=HbXKhQ3dTk6XUx8YCtBsthbmWCUTqNydSSnFvolOwZnxq7VnEvRzTBO24eq1um+ZpTfv+I mUrG8RmQRYbZPBKocfO0cqpqPbX1E/cQgxnyIAvaQjGLSUuRJ2kmSot6AknXadD/K8nUjg 6OnMr2Qw/iF25SdSg4HgHoY2hwnJ+Q8ZeDVx2uBbujfVXt9Vr3JiNnyGHqGdaBDQURpaJ1 58rtjeouoZssKwlBcLqVbi/tDC2WG7LJql0nJd4Fpphnkz9JVflFAyL7qdvvOAaWOc0grx wDn2IiUoBK4oSYb1O9znw7RKr+jFIdWG76ZaFxbxraSy8MeRk0T3HITu/Ju+cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xor8iKcPQNa6g8Hzu4FGn3zH/vhOb5mqbpVdToJc7LI=; b=aRm5HbloSYrMbxtrOjByNuMHpO7639MY1ISUbCCLaqNnHUA8oGPkkHdDg9Iem0zDlvE6AM CP5+VFpEO3WbRjjGvmERuyTO9JeKunBiC0NUVZPwDmeLNwI5gEfjUnjckxIK/VznscvepD n+9jzo1LCD5EUtacTBEZu2ARnozBGuBNxE1JQakA6tBvtbX9tC5CttvhxqgfYSvzYM6sHt vkBMEhCWXpVEsZK667RkIb9ALlr8NRO78QD6aYeDV9iCwM4hOb6R2Km40m+lI+gK8Z7nIY P4f2sM9o4QXmZTo/Oz2A8DqCLMy6gRt9g/8695gxLzLzMyLqC7IImjLqFIsVdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764624682; a=rsa-sha256; cv=none; b=NGVs0jlizPJXAIVBlEqHYt425BkYIqPPBAnui4M8CT+R9NIuOz1T+09FHt2edGYM2uZCrF 1BdOpR38lJAlxfhADrNKKGxN4QlQDmCzTXuUnI0ST/Qv19Wu3zCeQpaAWabQdFeyEmNLA1 FMqbCys18IbERrKCKNTJ250CSkB7cxBAAsAf58bwdL2jVYHcMtQGRYKUWmY1etoWP0aQ2x wo20EHIoangqrFPppmcuVrT5r/EYny9p+r7ptoQrCFnzH6Gh+OKyStZ9XzHOvhbx5HrY2A XNCKzHa/3Kv5eDmLTi6Og+JUQBisidVRFj2jNVR4mLduSkSgsozRDirzo8NydQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKxt24BRvzdyY for ; Mon, 01 Dec 2025 21:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 344f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 21:31:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 639e65144aa7 - main - pfsync: fix incorrect unlock during destroy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 639e65144aa71cb03b5431861803f528308760dc Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 21:31:22 +0000 Message-Id: <692e092a.344f5.30b2413f@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=639e65144aa71cb03b5431861803f528308760dc commit 639e65144aa71cb03b5431861803f528308760dc Author: Kristof Provost AuthorDate: 2025-12-01 21:30:56 +0000 Commit: Kristof Provost CommitDate: 2025-12-01 21:30:56 +0000 pfsync: fix incorrect unlock during destroy During pfsync_clone_destroy() we clean up pending packets. This may involve calling pfsync_undefer() or callout_drain(). We may not hold the bucket lock during callout_drain(), but must hold it during pfsync_undefer(). We incorrectly always released the lock, leading to assertion failures during cleanup if there were pending deferred packets. MFC after: 1 week Sponsored by: Orange Business Services --- sys/netpfil/pf/if_pfsync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index de69ecbb0985..b571734b4250 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -466,13 +466,13 @@ pfsync_clone_destroy(struct ifnet *ifp) TAILQ_FIRST(&b->b_deferrals); ret = callout_stop(&pd->pd_tmo); - PFSYNC_BUCKET_UNLOCK(b); if (ret > 0) { pfsync_undefer(pd, 1); } else { + PFSYNC_BUCKET_UNLOCK(b); callout_drain(&pd->pd_tmo); + PFSYNC_BUCKET_LOCK(b); } - PFSYNC_BUCKET_LOCK(b); } MPASS(b->b_deferred == 0); MPASS(TAILQ_EMPTY(&b->b_deferrals)); From nobody Tue Dec 2 01:16:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dL2sX4nz2z6J9hV for ; Tue, 02 Dec 2025 01:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dL2sX0yLVz3nhc for ; Tue, 02 Dec 2025 01:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764638176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4QE5VTTs/dJTiArTqTPUWndrfXLG1iStC2vIl3HxHs=; b=TXcEZ54y+LKXawyXw6MNWaT1e40FBtXPZPLpbGa8qvYFi+5+M1jJRGmqxGB9c+/Uuf5u7q h0JADjdCQn3a5BaZTk0tvdYyjniQt6ttIzdX8fvJh7kWz+Z13Sx2b9its9ZcQuUmt6/o+N P43jwOju6r8rJ4rlQm72Owng5JAPfb7nw4QLlMP1o4MlVtelXUeigwcDbqKFF68CZO8CiU mRSL0kNxXfsPHyTU3tPEDmWeDPxp1xBA99GiZIgQyMdVDLXD3sYuA9D3wmU0OLOo1JYonF KefM5LVAOEq9gY92/0u3UvvEvyvVY/9F9hBB4LFZDgUB5mxGbaQCtXfsM82yrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764638176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4QE5VTTs/dJTiArTqTPUWndrfXLG1iStC2vIl3HxHs=; b=FUwpYiYFfdH98wWqnSa10voMfSaJKtW8zYmpsl9f89CkELEFn0DVZc4lUTsUcAxSugGiEl Vc+OwH82thpQ6GzDJTbeiJQiwJs9kYsDBTlhcmPvtDdC5LWMKZ7h97meFHOac1pxKHhXkv 4iDABe0xwD0/wXrReXxB6+JWgk7XIeGzR68ugY0PHLZgUiaT8AVx9gbFuovIKo4rBMkH6S 93Z042cK16wJpHxjYYH4oWd7+rIby08avGnroIJPwLf8yo9zxtfR/tdFoVYFppSusX7QR5 x5r5Hx/CIDrt+oJAS8yZMwcZgKMcVNdvlY3xNg3rewhPyMBJP1LnXnmyCL8cDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764638176; a=rsa-sha256; cv=none; b=yZQi1GljlC6qWGALPixaE/bpXay8jx8cs8J4V5/XgtewhCjalJPOTtJmCe32WhT8xQgqsu 12aXeP7IpMR6aRlWKVh3kDvjha7eH9bZq8WXG5f/GhGSQuD+uPnmAUnv8/2mVxqj8D1bFE GUpSp4r2nSBjSHBeVEbQTQmd7nFtRgK7EfoCACWwX92p7+fEqsmU8Rv8RLXmZirRuh3CMY Nyda8EzZgW+7RasTfLC45ACCBotg7kJbAUWcD6vWAFMQSX+czvuy7C51QPsvinYv2Jbxjr n5vNr8wrNt4XGTXqFUahEzRX4OOZl3sxbyJPa+09eUN06Ncm0hOxHN4IBMWKxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dL2sX0VkXzm69 for ; Tue, 02 Dec 2025 01:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24cb8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 01:16:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Diane Bruce Subject: git: 791c531402bd - main - Fintek F81232 USB to serial driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: db X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 791c531402bd36252532a11c317fb6a5fdb9c000 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 01:16:16 +0000 Message-Id: <692e3de0.24cb8.2258136d@gitrepo.freebsd.org> The branch main has been updated by db: URL: https://cgit.FreeBSD.org/src/commit/?id=791c531402bd36252532a11c317fb6a5fdb9c000 commit 791c531402bd36252532a11c317fb6a5fdb9c000 Author: Diane Bruce AuthorDate: 2025-12-02 01:12:21 +0000 Commit: Diane Bruce CommitDate: 2025-12-02 01:15:37 +0000 Fintek F81232 USB to serial driver Driver for Feature Integration Technology Inc. (aka Fintek) F81232 USB to serial driver. Reviewed by: thj,adrian,UB Approved by: adrian Differential Revision: https://reviews.freebsd.org/D53893 --- share/man/man4/ufintek.4 | 118 +++++++ sys/dev/usb/serial/ufintek.c | 759 +++++++++++++++++++++++++++++++++++++++++++ sys/modules/ufintek/Makefile | 37 +++ 3 files changed, 914 insertions(+) diff --git a/share/man/man4/ufintek.4 b/share/man/man4/ufintek.4 new file mode 100644 index 000000000000..89e3d7b6e504 --- /dev/null +++ b/share/man/man4/ufintek.4 @@ -0,0 +1,118 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Diane Bruce +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd November, 2025 +.Dt UFINTEK 4 +.Os +.Sh NAME +.Nm ufintek +.Nd Fintek F81232 USB to serial UART driver +.Sh SYNOPSIS +.Cd "device usb" +.Cd "device ucom" +.Cd "device ufintek" +.Pp +In +.Xr rc.conf 5 : +.Cd kld_list="ufintek" +.Pp +In +.Xr sysctl.conf 5 : +.Cd hw.usb.ufintek.debug=1 +.Sh DESCRIPTION +The +.Nm +driver provides support for the F81232 serial adapter from FINTEK. +If the appropriate hardware is detected, +the driver will be loaded automatically by +.Xr devmatch 8 . +To load the driver manually, add it to the +.Ic kld_list +in +.Xr rc.conf 5 , +or use +.Xr kldload 8 +at runtime. +The device is accessed through the +.Xr ucom 4 +driver which makes it behave like a +.Xr tty 4 . +.Pp +Call out through this interface with applications like +.Xr cu 1 +or +.Xr tip 1 . +.Sh HARDWARE +The +.Nm +driver supports the following USB to serial UART controllers: +.Pp +.Bl -bullet -compact +.It +FT82332 +.El +.Sh SYSCTL VARIABLES +These settings can be entered in the +.Xr loader 8 +prompt, set in +.Xr loader.conf 5 , +.Xr sysctl.conf 5 , +or changed at runtime with +.Xr sysctl 8 : +.Bl -tag -width "hw.usb.uftdi.debug" +.It Va hw.usb.uftdi.debug +Enable debugging messages, default +.Ql 0 +.Ql 1 +.El +.Sh FILES +.Bl -tag -width "/dev/ttyU*.init" -compact +.It Pa /dev/ttyU* +for callin ports +.It Pa /dev/ttyU*.init +.It Pa /dev/ttyU*.lock +corresponding callin initial-state and lock-state devices +.Pp +.It Pa /dev/cuaU* +for callout ports +.It Pa /dev/cuaU*.init +.It Pa /dev/cuaU*.lock +corresponding callout initial-state and lock-state devices +.El +.Sh SEE ALSO +.Xr cu 1 , +.Xr tty 4 , +.Xr ucom 4 , +.Xr usb 4 +.Sh HISTORY +The +.Nm +driver appeared in +.Fx 16.0 +.Sh BUGS +This driver is limited to 9600 baud. + diff --git a/sys/dev/usb/serial/ufintek.c b/sys/dev/usb/serial/ufintek.c new file mode 100644 index 000000000000..ab2e35678c07 --- /dev/null +++ b/sys/dev/usb/serial/ufintek.c @@ -0,0 +1,759 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Diane Bruce + * 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 + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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. + */ + +/* + * Device driver for Fintek F81232 USB to UART bridge. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include "usbdevs.h" + +#define USB_DEBUG_VAR ufintek_debug +#include +#include + +#include + +#ifdef USB_DEBUG +static int ufintek_debug = 0; + +static SYSCTL_NODE(_hw_usb, OID_AUTO, ufintek, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "USB ufintek"); +SYSCTL_INT(_hw_usb_ufintek, OID_AUTO, debug, CTLFLAG_RWTUN, + &ufintek_debug, 1, "Debug level"); +#endif + +#define UFINTEK_BUFSIZE 256 +#define UFINTEK_CONFIG_INDEX 0 + +#define UFINTEK_REGISTER_REQUEST 0xA0 /* uint8_t request */ +#define UFINTEK_READ 0xC0 /* uint8_t requesttype */ +#define UFINTEK_WRITE 0x40 /* uint8_t requesttype */ + +#define UFINTEK_IFACE_INDEX 0 + +#define UFINTEK_UART_REG 0x120 + +/* + * It appears the FINTEK serial port looks much like a 16550 + */ + +#define UFINTEK_RXBUF 0x00 /* Receiver Buffer Read only */ +#define UFINTEK_TXBUF 0x00 /* Transmitter Holding Register Write only*/ +#define UFINTEK_IER 0x01 /* Interrupt Enable Read/Write */ +#define UFINTEK_IIR 0x02 /* Interrupt Identification Read only */ +#define UFINTEK_FCR 0x02 /* FIFO control Write only */ +#define UFINTEK_LCR 0x03 /* Line Control Register Read/Write */ +#define UFINTEK_MCR 0x04 /* Modem Control Write only */ +#define UFINTEK_LSR 0x05 /* Line Status Read only */ +#define UFINTEK_MSR 0x06 /* Modem Status Read only */ + +#define UFINTEK_BAUDLO 0x00 /* Same as UFINTEK_TXBUF and UFINTEK_RXBUF */ +#define UFINTEK_BAUDHI 0x01 /* Same as UFINTEK_IER */ + +/* From uart16550.readthedocs.io */ +#define UFINTEK_IER_RXEN 0x01 /* Received data available interrupt */ +#define UFINTEK_IER_TXEN 0x02 +#define UFINTEK_IER_RSEN 0x04 /* Receiver line status interrupt */ +#define UFINTEK_IER_MSI 0x08 +#define UFINTEK_IER_SLEEP 0x10 +#define UFINTEK_IER_XOFF 0x20 +#define UFINTEK_IER_RTS 0x40 + +#define UFINTEK_FCR_EN 0x01 +#define UFINTEK_FCR_RXCLR 0x02 +#define UFINTEK_FCR_TXCLR 0x04 +#define UFINTEK_FCR_DMA_BLK 0x08 +#define UFINTEK_FCR_TXLVL_MASK 0x30 +#define UFINTEK_FCR_TRIGGER_8 0x80 + +#define UFINTEK_ISR_NONE 0x01 +#define UFINTEK_ISR_TX 0x02 +#define UFINTEK_ISR_RX 0x04 +#define UFINTEK_ISR_LINE 0x06 +#define UFINTEK_ISR_MDM 0x08 +#define UFINTEK_ISR_RXTIMEOUT 0x0C +#define UFINTEK_ISR_RX_XOFF 0x10 +#define UFINTEK_ISR_RTSCTS 0x20 +#define UFINTEK_ISR_FIFOEN 0xC0 + +#define UFINTEK_LCR_WORDLEN_5 0x00 +#define UFINTEK_LCR_WORDLEN_6 0x01 +#define UFINTEK_LCR_WORDLEN_7 0x02 +#define UFINTEK_LCR_WORDLEN_8 0x03 + +/* As with ns16550 if word length is 5 then 2 stops is 1.5 stop bits. + * This mimics the ancient TTY15/19 (Murray code/Baudot) printers that + * needed an extra half stop bit to stop the mechanical clutch! +*/ +#define UFINTEK_LCR_STOP_BITS_1 0x00 +#define UFINTEK_LCR_STOP_BITS_2 0x04 + +#define UFINTEK_LCR_PARITY_NONE 0x00 +#define UFINTEK_LCR_PARITY_ODD 0x08 +#define UFINTEK_LCR_PARITY_EVEN 0x18 +#define UFINTEK_LCR_BREAK 0x40 +#define UFINTEK_LCR_DLAB 0x80 + +#define UFINTEK_MCR_DTR 0x01 +#define UFINTEK_MCR_RTS 0x02 +#define UFINTEK_MCR_LOOP 0x04 +#define UFINTEK_MCR_INTEN 0x08 +#define UFINTEK_MCR_LOOPBACK 0x10 +#define UFINTEK_MCR_XONANY 0x20 +#define UFINTEK_MCR_IRDA_EN 0x40 +#define UFINTEK_MCR_BAUD_DIV4 0x80 + +#define UFINTEK_LSR_RXDATA 0x01 +#define UFINTEK_LSR_RXOVER 0x02 +#define UFINTEK_LSR_RXPAR_ERR 0x04 +#define UFINTEK_LSR_RXFRM_ERR 0x08 +#define UFINTEK_LSR_RXBREAK 0x10 +#define UFINTEK_LSR_TXEMPTY 0x20 +#define UFINTEK_LSR_TXALLEMPTY 0x40 +#define UFINTEK_LSR_TXFIFO_ERR 0x80 + +#define UFINTEK_MSR_CTS_CHG 0x01 +#define UFINTEK_MSR_DSR_CHG 0x02 +#define UFINTEK_MSR_RI_CHG 0x04 +#define UFINTEK_MSR_CD_CHG 0x08 +#define UFINTEK_MSR_CTS 0x10 +#define UFINTEK_MSR_RTS 0x20 +#define UFINTEK_MSR_RI 0x40 +#define UFINTEK_MSR_CD 0x80 + +#define UFINTEK_BAUD_REF 115200 +#define UFINTEK_DEF_SPEED 115200 + +/* + * XXX Future use + * Baud rate multiplier clock + * On other similar FINTEK chips the divider clock can be modified + * via another port. This will be easy to add later. + * + * 0x00 1.846MHz + * 0x01 18.46MHz + * 0x10 24.00MHz + * 0x11 14.77MHz + */ +#define UFINTEK_CLK_REG 0x106 +#define UFINTEK_CLK_MSK 0x3 +#define UFINTEK_CLK_1_846 0x00 +#define UFINTEK_CLK_18_46 0x01 +#define UFINTEK_CLK_24_00 0x10 +#define UFINTEK_CLK_14_77 0x11 + +enum { + UFINTEK_BULK_DT_WR, + UFINTEK_BULK_DT_RD, + UFINTEK_N_TRANSFER, +}; + +struct ufintek_softc { + struct ucom_super_softc sc_super_ucom; + struct ucom_softc sc_ucom; + + struct usb_xfer *sc_xfer[UFINTEK_N_TRANSFER]; + struct usb_device *sc_udev; + struct mtx sc_mtx; + + uint32_t sc_model; + uint8_t sc_lcr; + uint8_t sc_mcr; +}; + +/* prototypes */ +static device_probe_t ufintek_probe; +static device_attach_t ufintek_attach; +static device_detach_t ufintek_detach; +static void ufintek_free_softc(struct ufintek_softc *); + +static usb_callback_t ufintek_write_callback; +static usb_callback_t ufintek_read_callback; +static void ufintek_free(struct ucom_softc *); +static void ufintek_cfg_open(struct ucom_softc *); +static void ufintek_cfg_close(struct ucom_softc *); +static void ufintek_cfg_set_dtr(struct ucom_softc *, uint8_t); +static void ufintek_cfg_set_rts(struct ucom_softc *, uint8_t); +static void ufintek_cfg_set_break(struct ucom_softc *, uint8_t); +static void ufintek_cfg_param(struct ucom_softc *, struct termios *); +static void ufintek_cfg_get_status(struct ucom_softc *, uint8_t *, uint8_t *); +static int ufintek_pre_param(struct ucom_softc *, struct termios *); +static void ufintek_cfg_write(struct ufintek_softc *, uint16_t, uint8_t); +static uint8_t ufintek_cfg_read(struct ufintek_softc *, uint16_t); +static void ufintek_start_read(struct ucom_softc *); +static void ufintek_stop_read(struct ucom_softc *); +static void ufintek_start_write(struct ucom_softc *); +static void ufintek_stop_write(struct ucom_softc *); +static void ufintek_poll(struct ucom_softc *ucom); + +static const struct usb_config ufintek_config[UFINTEK_N_TRANSFER] = { + [UFINTEK_BULK_DT_WR] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .bufsize = UFINTEK_BUFSIZE, + .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, + .callback = &ufintek_write_callback, + }, + [UFINTEK_BULK_DT_RD] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .bufsize = UFINTEK_BUFSIZE, + .flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .callback = &ufintek_read_callback, + }, +}; + +static const struct ucom_callback ufintek_callback = { + /* configuration callbacks */ + .ucom_cfg_get_status = &ufintek_cfg_get_status, + .ucom_cfg_set_dtr = &ufintek_cfg_set_dtr, + .ucom_cfg_set_rts = &ufintek_cfg_set_rts, + .ucom_cfg_set_break = &ufintek_cfg_set_break, + .ucom_cfg_open = &ufintek_cfg_open, + .ucom_cfg_close = &ufintek_cfg_close, + .ucom_cfg_param = &ufintek_cfg_param, + .ucom_pre_param = &ufintek_pre_param, + .ucom_start_read = &ufintek_start_read, + .ucom_stop_read = &ufintek_stop_read, + .ucom_start_write = &ufintek_start_write, + .ucom_stop_write = &ufintek_stop_write, + .ucom_poll = &ufintek_poll, + .ucom_free = &ufintek_free, +}; + +static device_method_t ufintek_methods[] = { + DEVMETHOD(device_probe, ufintek_probe), + DEVMETHOD(device_attach, ufintek_attach), + DEVMETHOD(device_detach, ufintek_detach), + DEVMETHOD_END +}; + +static driver_t ufintek_driver = { + .name = "ufintek", + .methods = ufintek_methods, + .size = sizeof(struct ufintek_softc), +}; + + +/* + * The following VENDOR PRODUCT definitions should be moved to usbdevs + * + * vendor FINTEK 0x1934 + * product FINTEK SERIAL 0x0706 + * + */ +#ifndef USB_VENDOR_FINTEK +#define USB_VENDOR_FINTEK 0x1934 +#endif +#ifndef USB_PRODUCT_FINTEK_SERIAL +#define USB_PRODUCT_FINTEK_SERIAL 0x0706 +#endif +#ifndef FINTEK_MODEL_F81232 +#define FINTEK_MODEL_F81232 0x02 +#endif + +static const STRUCT_USB_HOST_ID ufintek_devs[] = { + {USB_VPI(USB_VENDOR_FINTEK, USB_PRODUCT_FINTEK_SERIAL, FINTEK_MODEL_F81232)} +}; + +DRIVER_MODULE(ufintek, uhub, ufintek_driver, NULL, NULL); +MODULE_DEPEND(ufintek, ucom, 1, 1, 1); +MODULE_DEPEND(ufintek, usb, 1, 1, 1); +MODULE_VERSION(ufintek, 1); +USB_PNP_HOST_INFO(ufintek_devs); + +#define UFINTEK_DEFAULT_BAUD 115200 +#define UFINTEK_DEFAULT_LCR UFINTEK_LCR_WORDLEN_8|UFINTEK_LCR_STOP_BITS_1| \ + UFINTEK_LCR_PARITY_NONE + +static int +ufintek_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + + if (uaa->usb_mode != USB_MODE_HOST) { + return (ENXIO); + } + if (uaa->info.bConfigIndex != UFINTEK_CONFIG_INDEX) { + return (ENXIO); + } + if (uaa->info.bIfaceIndex != UFINTEK_IFACE_INDEX) { + return (ENXIO); + } + return (usbd_lookup_id_by_uaa(ufintek_devs, sizeof(ufintek_devs), uaa)); +} + +static int +ufintek_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct ufintek_softc *sc = device_get_softc(dev); + int error; + uint8_t iface_index; + + sc->sc_udev = uaa->device; + + device_set_usb_desc(dev); + + device_printf(dev, "\n"); + + mtx_init(&sc->sc_mtx, "ufintek", NULL, MTX_DEF); + ucom_ref(&sc->sc_super_ucom); + + DPRINTF("\n"); + + /* get chip model */ + sc->sc_model = USB_GET_DRIVER_INFO(uaa); + if (sc->sc_model == 0) { + device_printf(dev, "unsupported device\n"); + goto detach; + } + device_printf(dev, "FINTEK F8123%X USB to RS232 bridge\n", sc->sc_model); + iface_index = UFINTEK_IFACE_INDEX; + error = usbd_transfer_setup(uaa->device, &iface_index, + sc->sc_xfer, ufintek_config, + UFINTEK_N_TRANSFER, sc, &sc->sc_mtx); + + if (error) { + device_printf(dev, "allocating USB transfers failed\n"); + goto detach; + } + + /* clear stall at first run */ + mtx_lock(&sc->sc_mtx); + usbd_xfer_set_stall(sc->sc_xfer[UFINTEK_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[UFINTEK_BULK_DT_RD]); + mtx_unlock(&sc->sc_mtx); + + error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, + &ufintek_callback, &sc->sc_mtx); + if (error) { + goto detach; + } + ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev); + + return (0); /* success */ + +detach: + ufintek_detach(dev); + return (ENXIO); +} + +static int +ufintek_detach(device_t dev) +{ + struct ufintek_softc *sc = device_get_softc(dev); + + ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom); + usbd_transfer_unsetup(sc->sc_xfer, UFINTEK_N_TRANSFER); + + device_claim_softc(dev); + + ufintek_free_softc(sc); + + return (0); +} + +UCOM_UNLOAD_DRAIN(ufintek); + +static void +ufintek_free_softc(struct ufintek_softc *sc) +{ + if (ucom_unref(&sc->sc_super_ucom)) { + mtx_destroy(&sc->sc_mtx); + device_free_softc(sc); + } +} + +static void +ufintek_free(struct ucom_softc *ucom) +{ + ufintek_free_softc(ucom->sc_parent); +} + +static void +ufintek_cfg_open(struct ucom_softc *ucom) +{ + struct ufintek_softc *sc = ucom->sc_parent; + + /* Enable FIFO, trigger8 */ + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_FCR, + UFINTEK_FCR_EN | UFINTEK_FCR_TRIGGER_8); + + sc->sc_mcr = UFINTEK_MCR_DTR|UFINTEK_MCR_RTS; + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_MCR, sc->sc_mcr); + + /* Enable interrupts */ + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_IER, + UFINTEK_IER_MSI ); +} + +static void +ufintek_cfg_close(struct ucom_softc *ucom) +{ + return; +} + +static void +ufintek_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff) +{ + struct ufintek_softc *sc = ucom->sc_parent; + + if (onoff) + sc->sc_lcr |= UFINTEK_LCR_BREAK; + else + sc->sc_lcr &= ~UFINTEK_LCR_BREAK; + + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_LCR, sc->sc_lcr); +} + +static void +ufintek_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff) +{ + struct ufintek_softc *sc = ucom->sc_parent; + + if (onoff) + sc->sc_mcr |= UFINTEK_MCR_DTR; + else + sc->sc_mcr &= ~UFINTEK_MCR_DTR; + + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_MCR, sc->sc_mcr); +} + +static void +ufintek_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff) +{ + struct ufintek_softc *sc = ucom->sc_parent; + + if (onoff) + sc->sc_mcr |= UFINTEK_MCR_RTS; + else + sc->sc_mcr &= ~UFINTEK_MCR_RTS; + + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_MCR, sc->sc_mcr); +} + +static int +ufintek_pre_param(struct ucom_softc *ucom, struct termios *t) +{ + struct ufintek_softc *sc = ucom->sc_parent; + uint16_t divisor; + + if ((t->c_ospeed <= 1) || (t->c_ospeed > 115200)) + return (EINVAL); + + sc->sc_mcr = UFINTEK_MCR_DTR|UFINTEK_MCR_RTS; + sc->sc_lcr = UFINTEK_DEFAULT_LCR; + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_LCR, sc->sc_lcr); + + DPRINTF("baud=%d\n", t->c_ospeed); + + divisor = ((uint32_t)UFINTEK_BAUD_REF) / ((uint32_t)t->c_ospeed); + + if (divisor == 0) { + DPRINTF("invalid baud rate!\n"); + return (1); + } + + /* Flip RXBUF and TXBUF to BAUDLO and BAUDHI */ + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_LCR, UFINTEK_LCR_DLAB); + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_BAUDLO, + (divisor & 0xFF)); + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_BAUDHI, + ((divisor >> 8) & 0xFF)); + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_LCR, sc->sc_lcr); + + return (0); +} + +static void +ufintek_cfg_param(struct ucom_softc *ucom, struct termios *t) +{ + struct ufintek_softc *sc = ucom->sc_parent; + uint8_t lcr=0; + uint16_t divisor; + + DPRINTF("baud=%d\n", t->c_ospeed); + + divisor = ((uint32_t)UFINTEK_BAUD_REF) / ((uint32_t)t->c_ospeed); + + if (divisor == 0) { + DPRINTF("invalid baud rate!\n"); + return; + } + + /* Flip RXBUF and TXBUF to BAUDLO and BAUDHI */ + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_LCR, UFINTEK_LCR_DLAB); + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_BAUDLO, + (divisor & 0xFF)); + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_BAUDHI, + ((divisor >> 8) & 0xFF)); + + if (!(t->c_cflag & CIGNORE)) { + lcr = 0; + switch (t->c_cflag & CSIZE) { + case CS8: + lcr |= UFINTEK_LCR_WORDLEN_8; + break; + case CS7: + lcr |= UFINTEK_LCR_WORDLEN_7; + break; + case CS6: + lcr |= UFINTEK_LCR_WORDLEN_6; + break; + case CS5: + break; + default: + break; + } + + if (t->c_cflag & CSTOPB) + lcr |= UFINTEK_LCR_STOP_BITS_1; + if (t->c_cflag & PARODD) + lcr |= UFINTEK_LCR_PARITY_ODD; + else if (t->c_cflag & PARENB) + lcr |= UFINTEK_LCR_PARITY_EVEN; + } + sc->sc_lcr = lcr; + ufintek_cfg_write(sc, UFINTEK_UART_REG | UFINTEK_LCR, sc->sc_lcr); +} + +static void +ufintek_cfg_get_status(struct ucom_softc *ucom, uint8_t *p_lsr, uint8_t *p_msr) +{ + struct ufintek_softc *sc = ucom->sc_parent; + uint8_t lsr; + uint8_t ufintek_msr; + + lsr = ufintek_cfg_read(sc, UFINTEK_UART_REG | UFINTEK_LSR); + lsr &= 7; /* Only need bottom bits */ + *p_lsr = lsr; + + ufintek_msr = ufintek_cfg_read(sc, UFINTEK_UART_REG | UFINTEK_MSR); + + /* translate bits */ + + *p_msr = 0; + if (ufintek_msr & UFINTEK_MSR_CTS) + *p_msr |= SER_CTS; + + if (ufintek_msr & UFINTEK_MSR_CD) + *p_msr |= SER_DCD; + + if (ufintek_msr & UFINTEK_MSR_RI) + *p_msr |= SER_RI; + + if (ufintek_msr & UFINTEK_MSR_RTS) + *p_msr |= SER_RTS; +} + +static void +ufintek_start_read(struct ucom_softc *ucom) +{ + struct ufintek_softc *sc = ucom->sc_parent; + + usbd_transfer_start(sc->sc_xfer[UFINTEK_BULK_DT_RD]); +} + +static void +ufintek_stop_read(struct ucom_softc *ucom) +{ + struct ufintek_softc *sc = ucom->sc_parent; + + usbd_transfer_stop(sc->sc_xfer[UFINTEK_BULK_DT_RD]); +} + +static void +ufintek_start_write(struct ucom_softc *ucom) +{ + struct ufintek_softc *sc = ucom->sc_parent; + + usbd_transfer_start(sc->sc_xfer[UFINTEK_BULK_DT_WR]); +} + +static void +ufintek_stop_write(struct ucom_softc *ucom) +{ + struct ufintek_softc *sc = ucom->sc_parent; + + usbd_transfer_stop(sc->sc_xfer[UFINTEK_BULK_DT_WR]); +} + +static void +ufintek_cfg_write(struct ufintek_softc *sc, uint16_t reg, uint8_t val) +{ + struct usb_device_request req; + usb_error_t uerr; + uint8_t data; + + req.bmRequestType = UFINTEK_WRITE; + req.bRequest = UFINTEK_REGISTER_REQUEST; + USETW(req.wValue, reg); + USETW(req.wIndex, 0); + USETW(req.wLength, 1); + + data = val; + + uerr = ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + &req, &data, 0, 1000); + if (uerr != 0) + DPRINTF("failed to set ctrl %s\n", usbd_errstr(uerr)); +} + +static uint8_t +ufintek_cfg_read(struct ufintek_softc *sc, uint16_t reg) +{ + struct usb_device_request req; + uint8_t val; + + req.bmRequestType = UFINTEK_READ; + req.bRequest = UFINTEK_REGISTER_REQUEST; + USETW(req.wValue, reg); + USETW(req.wIndex, 0); + USETW(req.wLength, 1); + + ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, + &req, &val, 0, 1000); + + DPRINTF("reg=0x%04x, val=0x%02x\n", reg, val); + return (val); +} + + +static void +ufintek_write_callback(struct usb_xfer *xfer, usb_error_t error) +{ + struct ufintek_softc *sc = usbd_xfer_softc(xfer); + struct usb_page_cache *pc; + uint32_t actlen; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_SETUP: + case USB_ST_TRANSFERRED: +tr_setup: + + pc = usbd_xfer_get_frame(xfer, 0); + if (ucom_get_data(&sc->sc_ucom, pc, 0, + UFINTEK_BUFSIZE, &actlen)) { + usbd_xfer_set_frame_len(xfer, 0, actlen); + usbd_transfer_submit(xfer); + } + return; + + default: /* Error */ + if (error != USB_ERR_CANCELLED) { + /* try to clear stall first */ + usbd_xfer_set_stall(xfer); + goto tr_setup; + } + return; + } +} + +static void +ufintek_read_callback(struct usb_xfer *xfer, usb_error_t error) +{ + struct ufintek_softc *sc = usbd_xfer_softc(xfer); + struct usb_page_cache *pc; + int actlen; + uint8_t buf[UFINTEK_BUFSIZE]; + int i; + + usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + DPRINTF("got %d bytes\n", actlen); + if ((actlen < 2) || (actlen % 2)) + goto tr_setup; + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_out(pc, 0, &buf, sizeof(buf)); + /* XXX From Linux driver the very first byte after open + * is supposed to be a status which we should ignore. + * Why it is 0xFF I don't know TBH. + */ + if (buf[0] == 0xFF) + buf[0] = ufintek_cfg_read(sc, UFINTEK_UART_REG); + else { + /* + * Annoyingly this device presents data as + * ... + */ + for (i = 0; i < actlen; i += 2) { + ucom_put_data(&sc->sc_ucom, pc, i+1, 1); + } + + /* FALLTHROUGH */ + } + case USB_ST_SETUP: +tr_setup: + usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer)); + usbd_transfer_submit(xfer); + return; + + default: /* Error */ + if (error != USB_ERR_CANCELLED) { + /* try to clear stall first */ + usbd_xfer_set_stall(xfer); + goto tr_setup; + } + return; + } +} + + + +static void +ufintek_poll(struct ucom_softc *ucom) +{ + struct ufintek_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UFINTEK_N_TRANSFER); +} diff --git a/sys/modules/ufintek/Makefile b/sys/modules/ufintek/Makefile new file mode 100644 index 000000000000..8156205fdfd4 --- /dev/null +++ b/sys/modules/ufintek/Makefile @@ -0,0 +1,37 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Diane Bruce +# All rights reserved +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +S= ${SRCTOP}/sys + +.PATH: $S/dev/usb/serial + +KMOD= ufintek +SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ + ufintek.c + +.include From nobody Tue Dec 2 03:41:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dL65X3RFCz6JVGd for ; Tue, 02 Dec 2025 03:41: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dL65X1P3lz44Ss for ; Tue, 02 Dec 2025 03:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yW7s4Owclyh23ciW5mkOCF02LbmT+qJufYkxNDA5Q6E=; b=ShKeYh+BWQdSjKp7ELUo/klF9CC4rou0euaSbR3V1GSrfDHy+of7wA6j8FGBU2fkF3oOP8 0khewB176eYHUFsDgjOGkef5RulVXWar5QHabtzhwGim1fZHe4eAl8tFGB6ja7+aKUExHM 8ltwrmplkcEu8WdPjDHzas0BVUvmwnpNdJ02f3lEAIHVSJymxQ0MCYele9CQ3yr8eJ8EjU Y/LxC+lcc+CHr5S7Sd/uZA2p8ZA3nyfjLSV7UGrrykEImhPRRw6/1KV8dGRlvCLrC3/0W9 /9Mo1kD3VeIauR+sVYNXqjLlMgSOvWdYMWsuiOC8Ar40oN5Nn4eCgLlkANhnsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yW7s4Owclyh23ciW5mkOCF02LbmT+qJufYkxNDA5Q6E=; b=ZdCO0+XQXvcVkQbeLu5poKZxi3LUpj6QVs4kI25k7Ejc1gTkhTKXNiPydwT5+BaXZf77vB ZAsm90Hcu1YyRf3/DJ5hzWYCbHdksEzi6MFzb7wC5gm9nJVxctdxoKFOVco7Nf4hxC0kn4 xb107griD5ST3V37XjMJ2onThJOnlSUKFOioVAD4H1s3RXG87mdSTLLz9RY2ulGSDvBTjd 5eXqFHzxidV9hd/d1Tfy2OxHEF6+PbqvC/bdwCX7Qoanm4NIxoE9iQBP4jzUi55gQz4v0R COScYvi3ThM3DNeyFFZq9BTBxH7uBmBkpbB65Upx9bfWTJ29RIFWS6GoH5/4HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764646912; a=rsa-sha256; cv=none; b=TOXQLA3V1CDthvD1tWFaZJ6ay10hv3YYBH70H4cAA0oKZCbPeZjIT6MVU1ecPQMdpSWNkB TcxCKL302EONz7aSYTq7fPI31HLRLXm4tQPblJ2B7CxAvtbVwjSnQKNlAl0OEFR4WPKn6B CR82Z1vpS6UoVyh0w5pcESCFoAghmCsaS1yuiXgZjAF5V/tnicuONR208ykDx+hepsXjHv KY8nppYhTcRw+7IDNFOnm4Y9YD2YWKb+5ZHHtLqTkhznySJDX5GXLT48NKHFfoJ8tgJ7C7 e8N6LpsZDfPWy4YNsapu5yp4h6lSwPkkF7rtUGiiZa29cY07MwVW/rPHxwru4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dL65X0tKdzr0S for ; Tue, 02 Dec 2025 03:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33f70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 03:41:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 202292ef1078 - main - kern/subr_vmem.c: convert explicit vmem_list_lock use to macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 202292ef107834bfdbec357a9d1a88b9fcf9ceaa Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 03:41:52 +0000 Message-Id: <692e6000.33f70.10ca5078@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=202292ef107834bfdbec357a9d1a88b9fcf9ceaa commit 202292ef107834bfdbec357a9d1a88b9fcf9ceaa Author: Konstantin Belousov AuthorDate: 2025-10-14 17:13:46 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-02 03:41:12 +0000 kern/subr_vmem.c: convert explicit vmem_list_lock use to macros Reviewed by: bnovkov, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D27220 --- sys/kern/subr_vmem.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c index 9288b0935441..06c104b9fce2 100644 --- a/sys/kern/subr_vmem.c +++ b/sys/kern/subr_vmem.c @@ -194,6 +194,9 @@ static LIST_HEAD(, vmem) vmem_list = LIST_HEAD_INITIALIZER(vmem_list); static uma_zone_t vmem_zone; /* ---- misc */ +#define VMEM_LIST_LOCK() mtx_lock(&vmem_list_lock) +#define VMEM_LIST_UNLOCK() mtx_unlock(&vmem_list_lock) + #define VMEM_CONDVAR_INIT(vm, wchan) cv_init(&vm->vm_cv, wchan) #define VMEM_CONDVAR_DESTROY(vm) cv_destroy(&vm->vm_cv) #define VMEM_CONDVAR_WAIT(vm) cv_wait(&vm->vm_cv, &vm->vm_lock) @@ -777,7 +780,7 @@ vmem_periodic(void *unused, int pending) vmem_size_t desired; vmem_size_t current; - mtx_lock(&vmem_list_lock); + VMEM_LIST_LOCK(); LIST_FOREACH(vm, &vmem_list, vm_alllist) { #ifdef DIAGNOSTIC /* Convenient time to verify vmem state. */ @@ -802,7 +805,7 @@ vmem_periodic(void *unused, int pending) */ VMEM_CONDVAR_BROADCAST(vm); } - mtx_unlock(&vmem_list_lock); + VMEM_LIST_UNLOCK(); callout_reset(&vmem_periodic_ch, vmem_periodic_interval, vmem_periodic_kick, NULL); @@ -1271,9 +1274,9 @@ vmem_init(vmem_t *vm, const char *name, vmem_addr_t base, vmem_size_t size, } } - mtx_lock(&vmem_list_lock); + VMEM_LIST_LOCK(); LIST_INSERT_HEAD(&vmem_list, vm, vm_alllist); - mtx_unlock(&vmem_list_lock); + VMEM_LIST_UNLOCK(); return vm; } @@ -1301,9 +1304,9 @@ void vmem_destroy(vmem_t *vm) { - mtx_lock(&vmem_list_lock); + VMEM_LIST_LOCK(); LIST_REMOVE(vm, vm_alllist); - mtx_unlock(&vmem_list_lock); + VMEM_LIST_UNLOCK(); vmem_destroy1(vm); } From nobody Tue Dec 2 03:41:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dL65Y3x8Lz6JTxT for ; Tue, 02 Dec 2025 03:41: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dL65Y1ggqz44Nc for ; Tue, 02 Dec 2025 03:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHi0gynl6HuXqfUAZNh4SfomS0Nq0AZ66tdlVoiuZJY=; b=EqL8bUkXEdK2DDw8/JgowuIi3jPvfmy0sZUQJnh8gq0uQWk40ICnrRYZ7grMAWthU37oN3 5FlI2yRXgGJlLj1NWYFy4AhG+70nNZXrnUh3ibRpC0Jwzwjgm3RTSMuT8kgo9WsNNunV2C rg1WlNvBap3QzrbW4GlQVHkVHHuV23rE95SSwLsyUqskUSB3km/Dmkd0k+sJ4buRjZaUGW AiUlJx5/Edxi0tIwp6q4Qt0BovgV0Kr1lnRrQVmSsg4mUAezzAiNpnQO5ss98lb7OLloU5 Wzc4IlpNW7EYpBG8CVDQ3/WKuKb4SrPnbFHXbVjxhL+adxrH4yyx2l9awab04g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VHi0gynl6HuXqfUAZNh4SfomS0Nq0AZ66tdlVoiuZJY=; b=ZHvxgzKfyHn6KLH1zNBv1QSkAZ4k9mkNX551jjrtwmIitHYUFgMqtcA4+lAU/yZLXApEUR Cyye0e/IYTiLmnVy2BOEYeiYyRORDYLo86ni1P9GwcJRWGKOUZ1qctzPZx9Bxj3ggkr4Ox oDFZKkNb/nruKBZDbmbEm3kN43biBkT/5nXeuNQmQfU5Ffhk7zhiOWpO6mvfw5PKPhGYX1 Qm3sMsLzDQI8lQ8aM4610tbWfhFLj0+MEQCvxJpUvOGPocSQFm/FxY25TVxJ2oG647D6Iu xOLWwx9Hx4MwMW8YqlPnI9JSLKKx55MnwQqLTkIjT4WEwKriqmDiJAFcBrEwmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764646913; a=rsa-sha256; cv=none; b=ISank2x5EPKLlArXlBdTE7tyqe8vvFQBUFsh7EiaExT1P5MxVFpp6PnIRQIgwBDL0g13yt qXcERjntY58a+crTO7cifYxkHplP0QR9q0g3iZXpd8Tpfn6QMc9gnx5kVboYxdlDbh12sJ JBN4Qr1pBTcZAQwiYfdB8KDenoMKeqp0cUu/ZU0MEisn9Q27pIcD3OQ2aO7d7MJgfSG2EO 5/lJZeBgUEBjjLCa+ReH89ErsusFvUPy/zUcQSp6q9JYLfr7mbaBbyesbsyOCTyH4WqaUu lUTM58Y3JLLYvRDHkTxdF1oQ6Vbmb+5UlnX0h+XezGKxZ8ZdWsKGJGR8sA4WQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dL65Y1GDLzqT0 for ; Tue, 02 Dec 2025 03:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 340b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 03:41:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 305e33d4c6ed - main - kern/subr_vmem.c: remove unused VMEM_TRYLOCK() macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 305e33d4c6edd735590909161ff0847e73e68b66 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 03:41:53 +0000 Message-Id: <692e6001.340b6.26d455d1@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=305e33d4c6edd735590909161ff0847e73e68b66 commit 305e33d4c6edd735590909161ff0847e73e68b66 Author: Konstantin Belousov AuthorDate: 2025-10-16 23:53:41 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-02 03:41:12 +0000 kern/subr_vmem.c: remove unused VMEM_TRYLOCK() macro Reviewed by: bnovkov, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D27220 --- sys/kern/subr_vmem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c index 06c104b9fce2..507c8ad897e9 100644 --- a/sys/kern/subr_vmem.c +++ b/sys/kern/subr_vmem.c @@ -203,7 +203,6 @@ static uma_zone_t vmem_zone; #define VMEM_CONDVAR_BROADCAST(vm) cv_broadcast(&vm->vm_cv) #define VMEM_LOCK(vm) mtx_lock(&vm->vm_lock) -#define VMEM_TRYLOCK(vm) mtx_trylock(&vm->vm_lock) #define VMEM_UNLOCK(vm) mtx_unlock(&vm->vm_lock) #define VMEM_LOCK_INIT(vm, name) mtx_init(&vm->vm_lock, (name), NULL, MTX_DEF) #define VMEM_LOCK_DESTROY(vm) mtx_destroy(&vm->vm_lock) From nobody Tue Dec 2 03:41:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dL65Z5Pbyz6JV50 for ; Tue, 02 Dec 2025 03:41: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dL65Z2758z44QN for ; Tue, 02 Dec 2025 03:41:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxrLZh7hrFYl9J3MzT6EUZ9r60xzdqhkvmcPEuX4I5w=; b=dXuFtX0fFwZZM3vI9lTn/LwiHSc8ZqLhZqUNSZFmXDi64ndU9I+sfORg2NshmUN3ZXWq5l QY23FePl2lUXzw2cRiHNKZoVKLOdJVZEqru7TyFPHr6Q8b7Zyfage2YuDJy+WwGUaNpo6t xCLvjdxEYp/gfoDMy5z6yNBlk01JOzHllVrqayMJUAoDKAAGCHG4/ti0Z81+M+zpTr/oRJ E0hsJFB/N4pewxmuq03XJBbiJbJnNpgOliwEAMq5A5/oAsdr8tKmn07UEKSFIejPtwPMsR 8crTrwg+NJIbw59rYeB7Ul0q7o546BO0XNAKhpPZWlxpAIlcgdJBhsBv15ewIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxrLZh7hrFYl9J3MzT6EUZ9r60xzdqhkvmcPEuX4I5w=; b=hjCwdWjEIRwnNbu03915XAPLj1qKhm4J9AjANfY2cYlo6rGFswSgL48DOd8Drb1Gy2rGNE omXMGxlILeATTjMXFQAPph0FDinhfM1+/iVLBy78e3p5D9kwmjItK3hGu+Ws3moOFNXTAO 9sWGEWKaWRQodKiJ/zvk/mNuhRZqc6B7AEi1U3EcJ2Kk9RFSu00xNx/YnxngkMEevog/aZ Yq8iAHRaBm4UviPa+/8qgHcHPKcHASD16eJWPfOGFtux/64b9p/2QSbr41fK8mifpnPi0Q 7FCwijY7Hoa5UlV8cA/bIs+ZmNFxBA7wk9dOZ+mDrLU4L/billoeTeWpunkTqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764646914; a=rsa-sha256; cv=none; b=KT85z3SskM7yv3xgrljyPVp64WyOSM706eHp+ZW9gV7ZGSlaXdWiizJyUfjWkfc9/UfWya qmrJYYkIvb6RpFP8ZN/YbEz/1RQoWXwQ4zGO9en5v9ZLs9tabeuXkxlGyfMOL6uwsWei38 EcU93oAR3hnUheb3Yi4czStw0jPWPRb+i2Is9YlNZy4cWd/bkXS4x1ZAH5u0V6uhl9gpz3 gi1hYmKO5o3KVTyJVWLWMzPNPtXuqVqA7+g5+yEXH6qLU95cHREJtYUQt8vFrp+Jo3a4J7 09l6iABFxT19vYAcSktxxHGJXAAZLGmzN7gxoWqdCg88p8+zh39VKnKZ3KQy9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dL65Z1h44zqW0 for ; Tue, 02 Dec 2025 03:41:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3275b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 03:41:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1ecf01065b45 - main - libuvmem: usermode port of vmem(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ecf01065b45018de3901c8bf89d703af737feeb Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 03:41:54 +0000 Message-Id: <692e6002.3275b.671639f8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1ecf01065b45018de3901c8bf89d703af737feeb commit 1ecf01065b45018de3901c8bf89d703af737feeb Author: Konstantin Belousov AuthorDate: 2020-12-21 17:41:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-02 03:41:13 +0000 libuvmem: usermode port of vmem(9) The quantum cache is disabled, there is no uma. Intent is to use this for resource allocation in bhyve(8), for start. Addition of -luvmem to bhyve linking was done to test changes to share/mk. Reviewed by: bnovkov, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D27220 --- lib/Makefile | 1 + lib/libuvmem/Makefile | 17 +++ lib/libuvmem/Symbol.map | 15 +++ share/mk/bsd.libnames.mk | 1 + share/mk/src.libnames.mk | 5 + sys/contrib/openzfs/include/sys/zfs_context.h | 2 + sys/kern/subr_vmem.c | 151 +++++++++++++++++++++++--- sys/sys/vmem.h | 23 ++-- usr.sbin/bhyve/Makefile | 2 +- 9 files changed, 194 insertions(+), 23 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 75a2355aa452..216ba1d58473 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -107,6 +107,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libulog \ libutil \ libutil++ \ + libuvmem \ ${_libvgl} \ libwrap \ libxo \ diff --git a/lib/libuvmem/Makefile b/lib/libuvmem/Makefile new file mode 100644 index 000000000000..9d13eabd277c --- /dev/null +++ b/lib/libuvmem/Makefile @@ -0,0 +1,17 @@ +PACKAGE= runtime + +LIB= uvmem +SRCS= subr_vmem.c + +SHLIB_MAJOR= 1 +LIBADD+= pthread +CFLAGS.clang+=-Wno-thread-safety-analysis + +SYMBOL_MAPS= ${.CURDIR}/Symbol.map +VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def + +.include + +.PATH: ${SRCTOP}/sys/kern + +.include diff --git a/lib/libuvmem/Symbol.map b/lib/libuvmem/Symbol.map new file mode 100644 index 000000000000..0f408460cd9c --- /dev/null +++ b/lib/libuvmem/Symbol.map @@ -0,0 +1,15 @@ +FBSD_1.9 { + vmem_add; + vmem_alloc; + vmem_create; + vmem_destroy; + vmem_free; + vmem_init; + vmem_roundup_size; + vmem_set_import; + vmem_set_limit; + vmem_set_reclaim; + vmem_size; + vmem_xalloc; + vmem_xfree; +}; diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 2f099e0579b2..54bdfd301cd3 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -171,6 +171,7 @@ LIBUSB?= ${LIBDESTDIR}${LIBDIR_BASE}/libusb.a LIBUSBHID?= ${LIBDESTDIR}${LIBDIR_BASE}/libusbhid.a LIBUTIL?= ${LIBDESTDIR}${LIBDIR_BASE}/libutil.a LIBUUTIL?= ${LIBDESTDIR}${LIBDIR_BASE}/libuutil.a +LIBUVMEM?= ${LIBDESTDIR}${LIBDIR_BASE}/libuvmem.a LIBVERTO?= ${LIBDESTDIR}${LIBDIR_BASE}/libverto.a LIBVGL?= ${LIBDESTDIR}${LIBDIR_BASE}/libvgl.a LIBVMMAPI?= ${LIBDESTDIR}${LIBDIR_BASE}/libvmmapi.a diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index fd0424a96d9b..e108cc15fb55 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -237,6 +237,7 @@ _LIBRARIES= \ usb \ usbhid \ util \ + uvmem \ uutil \ verto \ vmmapi \ @@ -491,6 +492,7 @@ _DP_fifolog= z _DP_ipf= kvm _DP_tpool= spl _DP_uutil= avl spl +_DP_uvmem= pthread _DP_zfs= md pthread rt umem util uutil m avl bsdxml crypto geom nvpair \ z zfs_core zutil _DP_zfsbootenv= zfs nvpair @@ -767,6 +769,9 @@ LIBSYS_PIC?= ${LIBSYS_PICDIR}/libsys_pic.a LIBSAMPLERATEDIR?= ${_LIB_OBJTOP}/lib/libsamplerate LIBSAMPLERATE?= ${LIBSAMPLERATEDIR}/libsamplerate${PIE_SUFFIX}.a +LIBUVMEMDIR= ${OBJTOP}/lib/libuvmem +LIBUVMEM?= ${LIBUVMEMDIR}/libuvmem${PIE_SUFFIX}.a + # Define a directory for each library. This is useful for adding -L in when # not using a --sysroot or for meta mode bootstrapping when there is no # Makefile.depend. These are sorted by directory. diff --git a/sys/contrib/openzfs/include/sys/zfs_context.h b/sys/contrib/openzfs/include/sys/zfs_context.h index 5e571d497642..791a15196e3e 100644 --- a/sys/contrib/openzfs/include/sys/zfs_context.h +++ b/sys/contrib/openzfs/include/sys/zfs_context.h @@ -50,7 +50,9 @@ extern "C" { #include #include #include +#ifndef __FreeBSD__ #include +#endif #include #include #include diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c index 507c8ad897e9..afc327c512ce 100644 --- a/sys/kern/subr_vmem.c +++ b/sys/kern/subr_vmem.c @@ -41,6 +41,9 @@ */ #include + +#ifdef _KERNEL + #include "opt_ddb.h" #include @@ -75,6 +78,28 @@ #include #include +#else /* _KERNEL */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define KASSERT(a, b) +#define MPASS(a) +#define WITNESS_WARN(a, b, c) +#define panic(...) assert(0) + +#endif /* _KERNEL */ + #define VMEM_OPTORDER 5 #define VMEM_OPTVALUE (1 << VMEM_OPTORDER) #define VMEM_MAXORDER \ @@ -87,24 +112,40 @@ #define VMEM_FITMASK (M_BESTFIT | M_FIRSTFIT | M_NEXTFIT) -#define VMEM_FLAGS (M_NOWAIT | M_WAITOK | M_USE_RESERVE | M_NOVM | \ - M_BESTFIT | M_FIRSTFIT | M_NEXTFIT) - -#define BT_FLAGS (M_NOWAIT | M_WAITOK | M_USE_RESERVE | M_NOVM) - #define QC_NAME_MAX 16 /* * Data structures private to vmem. */ +#ifdef _KERNEL + +#define VMEM_FLAGS (M_NOWAIT | M_WAITOK | M_USE_RESERVE | M_NOVM | \ + M_BESTFIT | M_FIRSTFIT | M_NEXTFIT) + +#define BT_FLAGS (M_NOWAIT | M_WAITOK | M_USE_RESERVE | M_NOVM) + MALLOC_DEFINE(M_VMEM, "vmem", "vmem internal structures"); +#else /* _KERNEL */ + +/* bit-compat with kernel */ +#define M_ZERO 0 +#define M_NOVM 0 +#define M_USE_RESERVE 0 + +#define VMEM_FLAGS (M_NOWAIT | M_BESTFIT | M_FIRSTFIT | M_NEXTFIT) + +#define BT_FLAGS 0 + +#endif /* _KERNEL */ + typedef struct vmem_btag bt_t; TAILQ_HEAD(vmem_seglist, vmem_btag); LIST_HEAD(vmem_freelist, vmem_btag); LIST_HEAD(vmem_hashlist, vmem_btag); +#ifdef _KERNEL struct qcache { uma_zone_t qc_cache; vmem_t *qc_vmem; @@ -113,6 +154,7 @@ struct qcache { }; typedef struct qcache qcache_t; #define QC_POOL_TO_QCACHE(pool) ((qcache_t *)(pool->pr_qcache)) +#endif #define VMEM_NAME_MAX 16 @@ -132,8 +174,13 @@ struct vmem_btag { /* vmem arena */ struct vmem { +#ifdef _KERNEL struct mtx_padalign vm_lock; struct cv vm_cv; +#else + pthread_mutex_t vm_lock; + pthread_cond_t vm_cv; +#endif char vm_name[VMEM_NAME_MAX+1]; LIST_ENTRY(vmem) vm_alllist; struct vmem_hashlist vm_hash0[VMEM_HASHSIZE_MIN]; @@ -165,8 +212,10 @@ struct vmem { /* Space exhaustion callback. */ vmem_reclaim_t *vm_reclaimfn; +#ifdef _KERNEL /* quantum cache */ qcache_t vm_qcache[VMEM_QCACHE_IDX_MAX]; +#endif }; #define BT_TYPE_SPAN 1 /* Allocated from importfn */ @@ -178,6 +227,7 @@ struct vmem { #define BT_END(bt) ((bt)->bt_start + (bt)->bt_size - 1) +#ifdef _KERNEL #if defined(DIAGNOSTIC) static int enable_vmem_check = 0; SYSCTL_INT(_debug, OID_AUTO, vmem_check, CTLFLAG_RWTUN, @@ -190,10 +240,17 @@ static int vmem_periodic_interval; static struct task vmem_periodic_wk; static struct mtx_padalign __exclusive_cache_line vmem_list_lock; -static LIST_HEAD(, vmem) vmem_list = LIST_HEAD_INITIALIZER(vmem_list); static uma_zone_t vmem_zone; +#else /* _KERNEL */ +static pthread_mutex_t vmem_list_lock = PTHREAD_MUTEX_INITIALIZER; + +#endif /* _KERNEL */ + +static LIST_HEAD(, vmem) vmem_list = LIST_HEAD_INITIALIZER(vmem_list); + /* ---- misc */ +#ifdef _KERNEL #define VMEM_LIST_LOCK() mtx_lock(&vmem_list_lock) #define VMEM_LIST_UNLOCK() mtx_unlock(&vmem_list_lock) @@ -207,6 +264,21 @@ static uma_zone_t vmem_zone; #define VMEM_LOCK_INIT(vm, name) mtx_init(&vm->vm_lock, (name), NULL, MTX_DEF) #define VMEM_LOCK_DESTROY(vm) mtx_destroy(&vm->vm_lock) #define VMEM_ASSERT_LOCKED(vm) mtx_assert(&vm->vm_lock, MA_OWNED); +#else /* _KERNEL */ +#define VMEM_LIST_LOCK() pthread_mutex_lock(&vmem_list_lock) +#define VMEM_LIST_UNLOCK() pthread_mutex_unlock(&vmem_list_lock) + +#define VMEM_CONDVAR_INIT(vm, wchan) pthread_cond_init(&vm->vm_cv, NULL) +#define VMEM_CONDVAR_DESTROY(vm) pthread_cond_destroy(&vm->vm_cv) +#define VMEM_CONDVAR_WAIT(vm) pthread_cond_wait(&vm->vm_cv, &vm->vm_lock) +#define VMEM_CONDVAR_BROADCAST(vm) pthread_cond_broadcast(&vm->vm_cv) + +#define VMEM_LOCK(vm) pthread_mutex_lock(&vm->vm_lock) +#define VMEM_UNLOCK(vm) pthread_mutex_unlock(&vm->vm_lock) +#define VMEM_LOCK_INIT(vm, name) pthread_mutex_init(&vm->vm_lock, NULL) +#define VMEM_LOCK_DESTROY(vm) pthread_mutex_destroy(&vm->vm_lock) +#define VMEM_ASSERT_LOCKED(vm) pthread_mutex_isowned_np(&vm->vm_lock) +#endif /* _KERNEL */ #define VMEM_ALIGNUP(addr, align) (-(-(addr) & -(align))) @@ -231,6 +303,7 @@ static uma_zone_t vmem_zone; */ #define BT_MAXFREE (BT_MAXALLOC * 8) +#ifdef _KERNEL /* Allocator for boundary tags. */ static uma_zone_t vmem_bt_zone; @@ -245,7 +318,8 @@ vmem_t *transient_arena = &transient_arena_storage; #ifdef DEBUG_MEMGUARD static struct vmem memguard_arena_storage; vmem_t *memguard_arena = &memguard_arena_storage; -#endif +#endif /* DEBUG_MEMGUARD */ +#endif /* _KERNEL */ static bool bt_isbusy(bt_t *bt) @@ -265,12 +339,13 @@ bt_isfree(bt_t *bt) * at least the maximum possible tag allocations in the arena. */ static __noinline int -_bt_fill(vmem_t *vm, int flags) +_bt_fill(vmem_t *vm, int flags __unused) { bt_t *bt; VMEM_ASSERT_LOCKED(vm); +#ifdef _KERNEL /* * Only allow the kernel arena and arenas derived from kernel arena to * dip into reserve tags. They are where new tags come from. @@ -278,6 +353,7 @@ _bt_fill(vmem_t *vm, int flags) flags &= BT_FLAGS; if (vm != kernel_arena && vm->vm_arg != kernel_arena) flags &= ~M_USE_RESERVE; +#endif /* * Loop until we meet the reserve. To minimize the lock shuffle @@ -286,12 +362,18 @@ _bt_fill(vmem_t *vm, int flags) * holding a vmem lock. */ while (vm->vm_nfreetags < BT_MAXALLOC) { +#ifdef _KERNEL bt = uma_zalloc(vmem_bt_zone, (flags & M_USE_RESERVE) | M_NOWAIT | M_NOVM); +#else + bt = malloc(sizeof(struct vmem_btag)); +#endif if (bt == NULL) { +#ifdef _KERNEL VMEM_UNLOCK(vm); bt = uma_zalloc(vmem_bt_zone, flags); VMEM_LOCK(vm); +#endif if (bt == NULL) break; } @@ -351,7 +433,11 @@ bt_freetrim(vmem_t *vm, int freelimit) VMEM_UNLOCK(vm); while ((bt = LIST_FIRST(&freetags)) != NULL) { LIST_REMOVE(bt, bt_freelist); +#ifdef _KERNEL uma_zfree(vmem_bt_zone, bt); +#else + free(bt); +#endif } } @@ -538,6 +624,7 @@ bt_insfree(vmem_t *vm, bt_t *bt) /* ---- vmem internal functions */ +#ifdef _KERNEL /* * Import from the arena into the quantum cache in UMA. * @@ -722,8 +809,6 @@ vmem_startup(void) #endif } -/* ---- rehash */ - static int vmem_rehash(vmem_t *vm, vmem_size_t newhashsize) { @@ -821,6 +906,7 @@ vmem_start_callout(void *unused) vmem_periodic_kick, NULL); } SYSINIT(vfs, SI_SUB_CONFIGURE, SI_ORDER_ANY, vmem_start_callout, NULL); +#endif /* _KERNEL */ static void vmem_add1(vmem_t *vm, vmem_addr_t addr, vmem_size_t size, int type) @@ -876,10 +962,12 @@ vmem_destroy1(vmem_t *vm) { bt_t *bt; +#ifdef _KERNEL /* * Drain per-cpu quantum caches. */ qc_destroy(vm); +#endif /* * The vmem should now only contain empty segments. @@ -891,14 +979,23 @@ vmem_destroy1(vmem_t *vm) while ((bt = TAILQ_FIRST(&vm->vm_seglist)) != NULL) bt_remseg(vm, bt); - if (vm->vm_hashlist != NULL && vm->vm_hashlist != vm->vm_hash0) + if (vm->vm_hashlist != NULL && vm->vm_hashlist != vm->vm_hash0) { +#ifdef _KERNEL free(vm->vm_hashlist, M_VMEM); +#else + free(vm->vm_hashlist); +#endif + } bt_freetrim(vm, 0); VMEM_CONDVAR_DESTROY(vm); VMEM_LOCK_DESTROY(vm); +#ifdef _KERNEL uma_zfree(vmem_zone, vm); +#else + free(vm); +#endif } static int @@ -1055,8 +1152,10 @@ vmem_try_fetch(vmem_t *vm, const vmem_size_t size, vmem_size_t align, int flags) avail = vm->vm_size - vm->vm_inuse; bt_save(vm); VMEM_UNLOCK(vm); +#ifdef _KERNEL if (vm->vm_qcache_max != 0) qc_drain(vm); +#endif if (vm->vm_reclaimfn != NULL) vm->vm_reclaimfn(vm, flags); VMEM_LOCK(vm); @@ -1236,8 +1335,14 @@ vmem_init(vmem_t *vm, const char *name, vmem_addr_t base, vmem_size_t size, { vmem_size_t i; +#ifdef _KERNEL MPASS(quantum > 0); MPASS((quantum & (quantum - 1)) == 0); +#else + assert(quantum == 0); + assert(qcache_max == 0); + quantum = 1; +#endif bzero(vm, sizeof(*vm)); @@ -1252,7 +1357,11 @@ vmem_init(vmem_t *vm, const char *name, vmem_addr_t base, vmem_size_t size, vm->vm_size = 0; vm->vm_limit = 0; vm->vm_inuse = 0; +#ifdef _KERNEL qc_init(vm, qcache_max); +#else + (void)qcache_max; +#endif TAILQ_INIT(&vm->vm_seglist); vm->vm_cursor.bt_start = vm->vm_cursor.bt_size = 0; @@ -1290,7 +1399,13 @@ vmem_create(const char *name, vmem_addr_t base, vmem_size_t size, vmem_t *vm; +#ifdef _KERNEL vm = uma_zalloc(vmem_zone, flags & (M_WAITOK|M_NOWAIT)); +#else + assert(quantum == 0); + assert(qcache_max == 0); + vm = malloc(sizeof(vmem_t)); +#endif if (vm == NULL) return (NULL); if (vmem_init(vm, name, base, size, quantum, qcache_max, @@ -1302,7 +1417,6 @@ vmem_create(const char *name, vmem_addr_t base, vmem_size_t size, void vmem_destroy(vmem_t *vm) { - VMEM_LIST_LOCK(); LIST_REMOVE(vm, vm_alllist); VMEM_LIST_UNLOCK(); @@ -1324,7 +1438,6 @@ int vmem_alloc(vmem_t *vm, vmem_size_t size, int flags, vmem_addr_t *addrp) { const int strat __unused = flags & VMEM_FITMASK; - qcache_t *qc; flags &= VMEM_FLAGS; MPASS(size > 0); @@ -1332,7 +1445,10 @@ vmem_alloc(vmem_t *vm, vmem_size_t size, int flags, vmem_addr_t *addrp) if ((flags & M_NOWAIT) == 0) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "vmem_alloc"); +#ifdef _KERNEL if (size <= vm->vm_qcache_max) { + qcache_t *qc; + /* * Resource 0 cannot be cached, so avoid a blocking allocation * in qc_import() and give the vmem_xalloc() call below a chance @@ -1344,6 +1460,7 @@ vmem_alloc(vmem_t *vm, vmem_size_t size, int flags, vmem_addr_t *addrp) if (__predict_true(*addrp != 0)) return (0); } +#endif return (vmem_xalloc(vm, size, 0, 0, 0, VMEM_ADDR_MIN, VMEM_ADDR_MAX, flags, addrp)); @@ -1463,14 +1580,17 @@ out: void vmem_free(vmem_t *vm, vmem_addr_t addr, vmem_size_t size) { - qcache_t *qc; MPASS(size > 0); +#ifdef _KERNEL if (size <= vm->vm_qcache_max && __predict_true(addr >= VMEM_ADDR_QCACHE_MIN)) { + qcache_t *qc; + qc = &vm->vm_qcache[(size - 1) >> vm->vm_quantum_shift]; uma_zfree(qc->qc_cache, (void *)addr); } else +#endif vmem_xfree(vm, addr, size); } @@ -1564,11 +1684,13 @@ vmem_size(vmem_t *vm, int typemask) return (0); default: panic("vmem_size"); + return (0); } } /* ---- debug */ +#ifdef _KERNEL #if defined(DDB) || defined(DIAGNOSTIC) static void bt_dump(const bt_t *, int (*)(const char *, ...) @@ -1820,3 +1942,4 @@ vmem_check(vmem_t *vm) } #endif /* defined(DIAGNOSTIC) */ +#endif /* _KERNEL */ diff --git a/sys/sys/vmem.h b/sys/sys/vmem.h index 20eee9f6ccd3..daceac796722 100644 --- a/sys/sys/vmem.h +++ b/sys/sys/vmem.h @@ -33,8 +33,6 @@ #include -#ifdef _KERNEL - typedef struct vmem vmem_t; typedef uintptr_t vmem_addr_t; @@ -44,10 +42,24 @@ typedef size_t vmem_size_t; #define VMEM_ADDR_QCACHE_MIN 1 #define VMEM_ADDR_MAX (~(vmem_addr_t)0) +/* vmem_size typemask */ +#define VMEM_ALLOC 0x01 +#define VMEM_FREE 0x02 +#define VMEM_MAXFREE 0x10 + typedef int (vmem_import_t)(void *, vmem_size_t, int, vmem_addr_t *); typedef void (vmem_release_t)(void *, vmem_addr_t, vmem_size_t); typedef void (vmem_reclaim_t)(vmem_t *, int); +#ifndef _KERNEL +#define M_NOWAIT 0x0800 /* userspace hack */ +#define M_FIRSTFIT 0x1000 /* only for vmem, fast fit */ +#define M_BESTFIT 0x2000 /* only for vmem, low fragmentation */ +#define M_NEXTFIT 0x8000 /* only for vmem, follow cursor */ +#endif + +__BEGIN_DECLS + /* * Create a vmem: * name - Name of the region @@ -134,11 +146,6 @@ void vmem_printall(const char *, int (*fn)(const char *, ...) __printflike(1, 2)); void vmem_startup(void); -/* vmem_size typemask */ -#define VMEM_ALLOC 0x01 -#define VMEM_FREE 0x02 -#define VMEM_MAXFREE 0x10 - -#endif /* _KERNEL */ +__END_DECLS #endif /* !_SYS_VMEM_H_ */ diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index c454a280edba..25fb71b5768f 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -97,7 +97,7 @@ CFLAGS+=-I${.CURDIR} \ -I${.CURDIR}/../../contrib/lib9p \ -I${SRCTOP}/sys -LIBADD+= vmmapi md nv pthread z util sbuf cam 9p +LIBADD+= vmmapi md nv uvmem pthread z util sbuf cam 9p .if ${MK_BHYVE_SNAPSHOT} != "no" LIBADD+= ucl xo From nobody Tue Dec 2 03:41:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dL65b4GKGz6JV36 for ; Tue, 02 Dec 2025 03:41: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dL65b2QsNz44F6 for ; Tue, 02 Dec 2025 03:41:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qk/GnAsEPw/LBgcW7usvH6UhYodp0RR37FtijwVpEX8=; b=uWfRvmETs1OzmMPipwPJ2u5eLGrM5CxWNxuduQollX7bpW5ryyrK1VZYmjaaBs8eaKbM9a bZHzYIWV7naCam3kQZ8DYF3BsjeRUaCnfYk2LbncnwI0CiJKNKA0U0aRQbbQQ/5nlpZR4G g1+tsoCRXSUahpnsPtFb1sVmH2atDCd/bmzM8UjroKcD6A+6rIo37zVk/fQdXpnibHRLio Z4JrgrHBxzucQyphO0DMpKtqDcXcUPsbK6dH1xOvviUvxvybrXN37VqA3h0vTWwg3VHkwQ 5VDdltLdYFM9uR+G1+v47guJ3J6fc7BvPMvhm8yGDCUEZJIsyN2wxdeTJ50FIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764646915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qk/GnAsEPw/LBgcW7usvH6UhYodp0RR37FtijwVpEX8=; b=pZWxYRv2AypdQSG7SlfydrGULpmTzaCNjq2Xo8yEt9WBosCAo+T8gRke6dSraQ5ZZPzW+K M1ft6/Owpnuhe/gQBVjdw3nbekyIe/NMu6WfnNhrQXsM04/dRCIquLu1ssG7Fqzw8Y27k/ 4xvXVtleKjx8w7jiCz/1ujqihbX7Y1UzIYTUgH/pGrjiuz7qlr5U24gds8CHgBg5U8anOf e6MNjggV8YdCr2j0rEHR74bmR9PVUAKyLQECipqeBgWr972yHLu+IMm51q3cNwK27x3vwc 8W0N7bVR7MC2GPRJWG7U2au9h+U2LITSTZsRRkgZ3upbPFRtnJQzwW4oCazs0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764646915; a=rsa-sha256; cv=none; b=TaqopjknQm88JB4rmkGShktrxns0s0m8GP9ejsAEAa/wgYas9mXzSMAh6C1iD4XSiYK7Xe jG1Z7ojMa380gwakEY9A3rNfIkmDvjrLxRBoWzJxvZU167pbFU7LS7yf0cocbF+Hvx0y64 nYOx+f9wZSTt1rSOFG5tgtGs0GUh9aLieYu1CGicTAZZW26H2hhfrtTTPlXP35MjkJhwmq gVPSZQoQoujrSmhyuRdVPci9CRCrESD2EhH/w4ctXaylk8LtxPaboEQuq9nyT7fH7p9dOT Y5A1DIwJ1DtZRtqbY87oDUfsKqR8P4yybEMwnN5js1Vr1uG2PJH+wYN64rsxAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dL65b22SDzqT2 for ; Tue, 02 Dec 2025 03:41:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3225e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 03:41:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7295aeaf5f5c - main - libuvmem: provide man page mostly as a pointer to vmem(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7295aeaf5f5cbbbb16d4992b13b08bce09f03609 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 03:41:55 +0000 Message-Id: <692e6003.3225e.38bd67fc@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7295aeaf5f5cbbbb16d4992b13b08bce09f03609 commit 7295aeaf5f5cbbbb16d4992b13b08bce09f03609 Author: Konstantin Belousov AuthorDate: 2025-10-15 22:10:16 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-02 03:41:13 +0000 libuvmem: provide man page mostly as a pointer to vmem(9) Reviewed by: bnovkov, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D27220 --- lib/libuvmem/Makefile | 2 ++ lib/libuvmem/libuvmem.3 | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/lib/libuvmem/Makefile b/lib/libuvmem/Makefile index 9d13eabd277c..0dae3eb77a74 100644 --- a/lib/libuvmem/Makefile +++ b/lib/libuvmem/Makefile @@ -10,6 +10,8 @@ CFLAGS.clang+=-Wno-thread-safety-analysis SYMBOL_MAPS= ${.CURDIR}/Symbol.map VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def +MAN= libuvmem.3 + .include .PATH: ${SRCTOP}/sys/kern diff --git a/lib/libuvmem/libuvmem.3 b/lib/libuvmem/libuvmem.3 new file mode 100644 index 000000000000..5fbb50ec57c2 --- /dev/null +++ b/lib/libuvmem/libuvmem.3 @@ -0,0 +1,71 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 The FreeBSD Foundation +.\" +.\" This documentation was written by +.\" Konstantin Belousov under sponsorship +.\" from the FreeBSD Foundation. +.\" +.Dd October 16, 2025 +.Dt LIBUVMEM 3 +.Os +.Sh NAME +.Nm libuvmem +.Nd userspace general purpose resource allocator +.Sh SYNOPSIS +.Lb libuvmem +.In sys/vmem.h +.Sh DESCRIPTION +The +.Nm +is a general purpose resource allocator. +It is a port of the kernel facility of the similar name +.Nm vmem . +.Pp +Refer to the description of the kernel allocator +.Xr vmem 9 +to get the documentation for it. +.Sh NOTES +The +.Dq quantum cache +feature is not implemented for userspace, and the +.Fa quantum +and +.Fa qcache_max +arguments of the +.Fn vmem_create +function are ignored. +.Pp +The library internally uses +.Xr malloc 3 +to allocate structures tracking allocations. +.Pp +The allocator is thread-safe. +Locks for separate +.Nm vmem's +are independent between each other. +.Pp +The supported +.Fa flags +for the +.Fn vmem_xalloc +function are +.Bl -bullet +.It +.Dv M_NOWAIT +.It +.Dv M_FIRSTFIT +.It +.Dv M_BESTFIT +.It +.Dv M_NEXTFIT +.El +.Sh AUTHORS +See +.Xr vmem 9 +for the history of the kernel allocator. +.Pp +The userspace port for +.Fx +was done by +.An Konstantin Belousov Aq Mt kib@FreeBSD.org . From nobody Tue Dec 2 03:45:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dL69N655lz6JVBw for ; Tue, 02 Dec 2025 03:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dL69N4wX1z468h for ; Tue, 02 Dec 2025 03:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764647112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNbMRRyfoMI01zpNmA+X1S1sPcWSAC51Hx5N3othkwo=; b=vA4ImoWrDDEaRp6P6WGVzWbG/YBmDLwhanSgPaAEvvQ6bgIpFDE11iicIPKXClcCP7Zs1X YbA/OuAwxn89YSQfnlrfgXBds8Z+3dmnq5dfWjstGmAJjRo0cI2tAsXLirtcijdpmgm1vV oruih+5B3F5dmOQwIszlnWRhtwogo/tNGu0nDWzyb4woWSh6ZUNDxjRjwo5WpGM6+3ieZK vtOcwQXPsojusFqyop8trU8RNB/Z/YwpNa7D2P1wQBUf7sbqbBMfvqplpguq4dWJ/FH2IK WvdlH5oVK/vhtmrB4KaFe7BBmcsvYE9xTG0Ny/fdBeFRupXP4NHuDk6mBwaopQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764647112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNbMRRyfoMI01zpNmA+X1S1sPcWSAC51Hx5N3othkwo=; b=IA1DfXRUe7nhL5ndR8Xel0JVsCjeFsqphEEcCcfnbru/Wn+1lq7DczvtdyP2eq7hi5Qa9F JkNqVzvo1pA/37d2eMgqM3/E8DOt3xsVBqrGZGahdsjrcZXaAag+2BEJRtXvdMDX9+0s0z aT8XQ3eayHSNnvZrDTLIcURRC60ihVbIaVELWVaKd5uT1W94l5zppBfv9uxiXlYoAbh/T7 QHU8jjhsBEhiBlpoPNy5G1XQjVAGItFjNXvGxGfJe112XkNV1K5GJWIJaZsjncgZl2HN/4 tuLJlkM9G4TAkc6N7RlWLN/7MvY4FPUxEqieBGM6gtlAgk2tENyiQM/qiFLF9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764647112; a=rsa-sha256; cv=none; b=XyaIGuShoncs9P323z5B9JDifmSIpJAPC+s38IJhMsZjGzN8BOnQJNKocBEhAbys5Z4wFj 2uYL5xcBt3551qETm+Vt6stb/b3J7End1vfWJebN1TWUnbawj60scFEwIDODt5GKCNAAJ5 ReBVYjIKs9c/virF2XQBjoK4e3lGXi9eyj3fDoARpIAXl2ROxZMEpmSZI5qBixK7M9g6y6 2YRAwVZ5icv1hqC2v4ENHiutocJ/d/kNxkyPAvwKRWS2/O10eR7cbjT5WJ31hO97JF6eUg 4GFRX8BCLtFococvNkRAuWtlfgi5jJr53YlD0HY4lKelKW5iYqcSklrm2AknYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dL69N47jdzr54 for ; Tue, 02 Dec 2025 03:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32262 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 03:45:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 7b44ab1c6abe - main - bsd-family-tree: add FreeBSD 15.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b44ab1c6abe106a44604a8504edca0e57ec1c42 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 03:45:12 +0000 Message-Id: <692e60c8.32262.4f489280@gitrepo.freebsd.org> The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=7b44ab1c6abe106a44604a8504edca0e57ec1c42 commit 7b44ab1c6abe106a44604a8504edca0e57ec1c42 Author: Maxim Konovalov AuthorDate: 2025-12-02 03:44:42 +0000 Commit: Maxim Konovalov CommitDate: 2025-12-02 03:44:42 +0000 bsd-family-tree: add FreeBSD 15.0 --- share/misc/bsd-family-tree | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 01dfd4cc0cbf..36910c9ad94a 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -300,7 +300,7 @@ FreeBSD 5.2 | | | | | | | | | 6.1 | | | | FreeBSD | | | | | | | 8.4 | | NetBSD | | - | | | | | 6.1.1 | | + | | | | 6.1.1 | | | | | | | | | | FreeBSD | | NetBSD | | | 9.2 | | 6.1.2 | | @@ -483,6 +483,8 @@ FreeBSD 5.2 | | | | | macOS | | | | 26 | | | | | | OpenBSD 7.8 | + *--FreeBSD | | | | + | 15.0 | | | | | | | | | FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -930,6 +932,7 @@ DragonFly 6.4.2 2025-05-09 [DFB] FreeBSD 14.3 2025-06-10 [FBD] macOS 26 2025-09-15 [APL] OpenBSD 7.8 2025-10-22 [OBD] +FreeBSD 15.0 2025-12-02 [FBD] Bibliography ------------------------ From nobody Tue Dec 2 04:58:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dL7ny0phWz6Jdwc for ; Tue, 02 Dec 2025 04:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dL7nx6CPvz3G7P for ; Tue, 02 Dec 2025 04:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764651509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1drzYKM/C3np1U1zxwa16Ki/+51ayqQZk5ILtcrg3Lg=; b=ItTOuX2cCPbyiKfUOmmeHpqa/qH+ZvSKX1ezqQNXJ9to1shRYk/XAPlknf/37oUXgcpjeP BuiUtjquqcMkNlmj+IEftZ2RD8g5SiVf5iPnlOCd5wv4EPOw4cfOEm/qa7/9sjGnAtGv9W vOSJrNqANyRu8bo80B+AIbrB1tRKmZe7PeEhFo2EULyPVE8NJXgxI5Cq00QRbjMKvxWfX+ irTE6YQXLYopl2Ec0Bralc8oPJT9lyXAd4b2pDhJBCh7udzXBpKYedxgxxHwv8gWMJdyFH xR7Ij8W70E3fd9WYURtNuUmp8zVNv5yLNMwgQHvMKKpOK79di52DgvDDzeREqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764651509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1drzYKM/C3np1U1zxwa16Ki/+51ayqQZk5ILtcrg3Lg=; b=rekUHkdAtuk5J14Mx9CnE2LeV8AfCrUOE6I+ZCiy8tIjFCeAipcoP7H3xTMW/dDlxsjllG 7hZq0j1THIy2hXZAiiyjVIlxMvDDPPl9tfXNkQJXCDvrn/4vuQ62fLxfBLV6fBNr0nYs2d rANoSfeM0GXcJtqJHWngKA1hnirUnZKxViXFb9MTMlrRm5UobayUF84s5Ub506slubIZuL 7gYC2UOiUyspJ5UMsFebhfN7fNDeyFG5N4s6O/l89BsxYxX23CRjMQ9xcXw2u2rnx44+YS 0fhiRgJNiPbRf9hGqL6baUxhlJ7hrPS4evHwr1v0fNhUSar5ER01C/eq9GxatQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764651509; a=rsa-sha256; cv=none; b=x73lJRhMBDr40csjK5wx9KcuPjTMGdp5wwJYDz3py87uTh2H63bWsYJw5MZFfP6cVjLKkz 5/KMmKBl3nerfnJ716K3AkYFt8pqH6ub8eGN8g6Np885qDG22eu5MsGH/Qrb5QU6E2KX+1 gAMtlesPchJMgD56VFTGO60ertvh0HilSA5Czz+jIMUVuwM6AkU8TXTP3eDbgCTd3y0XM0 W9SNooW5XyvoEG0hed06s8im0oz6veOdRILKGeZ/JwVPVpR5Phfs6sntjzmgD670Tv4AlV naBw2gxDDxf0pMGlZulM4LIA1CNCzLANDBwXbQ2dlaZPki6mrTL3YAQOEEgZJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dL7nx5GVPzsTf for ; Tue, 02 Dec 2025 04:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ae84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 04:58:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: babb41a81e84 - main - nvme: Minor style nit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: babb41a81e84ecb055992720f36a80e31260d372 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 04:58:29 +0000 Message-Id: <692e71f5.3ae84.533b4550@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=babb41a81e84ecb055992720f36a80e31260d372 commit babb41a81e84ecb055992720f36a80e31260d372 Author: Warner Losh AuthorDate: 2025-12-02 04:55:39 +0000 Commit: Warner Losh CommitDate: 2025-12-02 04:58:07 +0000 nvme: Minor style nit Sponsored by: Netflix --- sys/dev/nvme/nvme.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 61e4aa8cb94b..b696cc6aa697 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -32,6 +32,7 @@ #include #ifdef _KERNEL #include +#include #else #include #endif @@ -1907,8 +1908,6 @@ void nvme_sc_sbuf(const struct nvme_completion *cpl, struct sbuf *sbuf); void nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen); #ifdef _KERNEL -#include - struct bio; struct thread; From nobody Tue Dec 2 05:51:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dL8zH67HPz6Jl4B for ; Tue, 02 Dec 2025 05:51:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (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 4dL8zH4H8cz3LVq for ; Tue, 02 Dec 2025 05:51:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-34361025290so4091714a91.1 for ; Mon, 01 Dec 2025 21:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1764654697; x=1765259497; 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=wEpKIytbPhLALPgO2GL4+SAC7u0EVkUR0/MsabC5fpQ=; b=fN5s8IHH6O+FWJUFM1UG5JPGZV3I5l35JOWvzyIaZDJuRHoRzS9d8IRZ6Lfq09Voxf fQN0di1d1FWhUbzRKLktJ4pDxt706Oli3JPqWeOxp4e9m/NQfUVgAg5awDHdHA14buW2 y8nkLKVDW4jmh3wVUj4RkHgczsMdUNHgdhEW5muNhHKtwJJKhmdEGfFWeHrJYb2e0m7A yv0XE9Epil2U0lMf0Vz339C7LP9CFh+1qL+W3Z7lBmg9Wq4ClCjuJgtBRRTQRm8qIXdq 3BLJjlaG9SlMaaRRb3wMH4qP6R0Cu1j2YfO++FL9QIcXN2Da32zDQE1xlsbqF3y3f0Wg 1cCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764654697; x=1765259497; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wEpKIytbPhLALPgO2GL4+SAC7u0EVkUR0/MsabC5fpQ=; b=ppHRmMkrWsKu/qPr5I8LLG5kAnZV3QBv/0/vpNetQQQmwSGeKx5b3Wu/ZFsra8YpYF W1XP6RiBONDi83l2XR6DKnaOmrPVDiwyLnUmNsSrLcrsi1hnDmLZ1yf8duQ4V+K0XLKx sX0dOsovtjlqj3s1wUL3tQeDds0abA+TfgX5w5/gwVlpM2eX+bs2jFk8TH/laNBoW138 q3hUxTrL6vSB8IaBmt6zzcDPVcNjO3V3pi4uW7QZbUduHIiPGcRS4uqE128qwKXG+oAD CiZsQuDHlPCWa8nSoV6dyyDcPYg5sIbCCCx5qFu23Nr8oUeDGjX1/pQ1p/7tjZ9qAr9l dwTA== X-Forwarded-Encrypted: i=1; AJvYcCUZSGCWHvc3GN6lkqDr/R203fUsZADDLuBqMAkCzKs1W8qIGt7hcsgnycJxniNNGS3EwSeG72j5gzVheRlAb1S1q/Brpg==@freebsd.org X-Gm-Message-State: AOJu0YzJWO5yVw8LHhDzNsMuJ2NQT7szViKKIEzCVBOMT8qpgoAPgE+a iSWNAZ3QHp0cn1CYhc3XJo2EmFPgMzDpDGdZolJfuVd+GOZrEDHCQjaVz/OC6tqmQerdY8LMWcw ED1Z0N/zSBBInigmOcDORznuwS4yLclBHm4gJVG23lQ== X-Gm-Gg: ASbGncuARMi/9MQkruUbZrZOI0BLwMR/kMRYSlz/3StdfOfYNagD5rwu87j/pJg45h/ 7rMzTeUVOSzUvlvayvCDCs/wOO4GdITDNUv9pF3fZ1ww1Vw3o0leeHihkfV+PnsnbQMNh6v/dMG wVRxrNDeYnBiHU4lSIeag0ijDbrybS08JMzC4Rsy/MY0R5X3z1k7iAKJZbIoBLhhf+xGdRyi1UT ULLrpbSYhJHaObfTbyTz/ZeuCT7YDKaH+3TMEqCTfeCVreciuXiLPNSFaJQOPscwkwsoeS/3QZ+ F0I8zg== X-Google-Smtp-Source: AGHT+IFGn9t39qdaeDy0XpHlqgnH2+HjvUVvZqOOIotl2I/1bmwIq3jhfxSsP4ttkoYf4jLC0gQhV/DNTGlQY2tNEak= X-Received: by 2002:a17:90b:2587:b0:340:f7d6:dc70 with SMTP id 98e67ed59e1d1-3475ebfa0d3mr24793822a91.13.1764654697043; Mon, 01 Dec 2025 21:51:37 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <6925d6af.3b42c.336a0065@gitrepo.freebsd.org> <6365e335-fcc8-4590-af40-230815012f9d@FreeBSD.org> In-Reply-To: <6365e335-fcc8-4590-af40-230815012f9d@FreeBSD.org> From: Warner Losh Date: Mon, 1 Dec 2025 22:51:26 -0700 X-Gm-Features: AWmQ_bntB_u9Xhw5oOwk5QTxeOusfTxRWfWSkFX4NlXfl-015X2OcWWq37ixGHc Message-ID: Subject: Re: git: 301b8a806f79 - main - nvme: Minor style(9) fixes To: John Baldwin Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000005e6a340644f1b078" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dL8zH4H8cz3LVq --0000000000005e6a340644f1b078 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Dec 1, 2025 at 7:53=E2=80=AFAM John Baldwin wrote= : > On 11/25/25 11:17, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D301b8a806f79292ee3324ca938a4d93= 8df1911e8 > > > > commit 301b8a806f79292ee3324ca938a4d938df1911e8 > > Author: Warner Losh > > AuthorDate: 2025-11-25 16:10:23 +0000 > > Commit: Warner Losh > > CommitDate: 2025-11-25 16:12:51 +0000 > > > > nvme: Minor style(9) fixes > > > > needs to be first after . And we don't > need > > both sys/param.h and sys/types.h. > > > > Fixes: 032fbda024d78 > > Sponsored by: Netflix > > --- > > sys/dev/nvme/nvme.h | 11 ++++------- > > 1 file changed, 4 insertions(+), 7 deletions(-) > > > > diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h > > index 3de65a4a481f..ddbc149802f4 100644 > > --- a/sys/dev/nvme/nvme.h > > +++ b/sys/dev/nvme/nvme.h > > @@ -29,15 +29,13 @@ > > #ifndef __NVME_H__ > > #define __NVME_H__ > > > > -#ifdef _KERNEL > > -#include > > -#endif > > - > > #include > > -#include > > -#ifndef _KERNEL > > +#ifdef _KERNEL > > +#include > > +#else > > #include > > #endif > > +#include > > > > struct sbuf; > > > > @@ -1909,7 +1907,6 @@ void nvme_sc_sbuf(const struct nvme_completion > *cpl, struct sbuf *sbuf); > > void nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, > int srclen); > > > > #ifdef _KERNEL > > -#include > > #include > > I should perhaps just move this to the top as well so all the #include's > are in one place. > Done --0000000000005e6a340644f1b078 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Dec 1, = 2025 at 7:53=E2=80=AFAM John Baldwin <jhb@freebsd.org> wrote:
On 11/25/25 11:17, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D301b8a806f79292ee3324ca938a4d938df1911e8<= /a>
>
> commit 301b8a806f79292ee3324ca938a4d938df1911e8
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2025-11-25 16:10:23 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2025-11-25 16:12:51 +0000
>
>=C2=A0 =C2=A0 =C2=A0 nvme: Minor style(9) fixes
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 <sys/systm.h> needs to be first after <sy= s/param.h>. And we don't need
>=C2=A0 =C2=A0 =C2=A0 both sys/param.h and sys/types.h.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 032fbda02= 4d78
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0Netflix
> ---
>=C2=A0 =C2=A0sys/dev/nvme/nvme.h | 11 ++++-------
>=C2=A0 =C2=A01 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
> index 3de65a4a481f..ddbc149802f4 100644
> --- a/sys/dev/nvme/nvme.h
> +++ b/sys/dev/nvme/nvme.h
> @@ -29,15 +29,13 @@
>=C2=A0 =C2=A0#ifndef __NVME_H__
>=C2=A0 =C2=A0#define __NVME_H__
>=C2=A0 =C2=A0
> -#ifdef _KERNEL
> -#include <sys/types.h>
> -#endif
> -
>=C2=A0 =C2=A0#include <sys/param.h>
> -#include <sys/endian.h>
> -#ifndef _KERNEL
> +#ifdef _KERNEL
> +#include <sys/systm.h>
> +#else
>=C2=A0 =C2=A0#include <stdbool.h>
>=C2=A0 =C2=A0#endif
> +#include <sys/endian.h>
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0struct sbuf;
>=C2=A0 =C2=A0
> @@ -1909,7 +1907,6 @@ void=C2=A0 =C2=A0 nvme_sc_sbuf(const struct nvme= _completion *cpl, struct sbuf *sbuf);
>=C2=A0 =C2=A0void=C2=A0 =C2=A0 =C2=A0 =C2=A0 nvme_strvis(uint8_t *dst, = const uint8_t *src, int dstlen, int srclen);
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0#ifdef _KERNEL
> -#include <sys/systm.h>
>=C2=A0 =C2=A0#include <sys/disk.h>

I should perhaps just move this to the top as well so all the #include'= s are in one place.

--0000000000005e6a340644f1b078-- From nobody Tue Dec 2 13:35:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLMG82Gj4z6KS1w for ; Tue, 02 Dec 2025 13:35: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLMG81g3rz3nCX for ; Tue, 02 Dec 2025 13:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764682512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQFPbkZmbnLDkjwv4jVz9QE4aZgOufVhJ7/pdHtd/nk=; b=cpsNpcYgz6VmrwcFfQoUrJfNohaAO9nIj9p9sgs5qfs2sElbrlhLpKLph7kzomPg739NQz 25rhMsRGMaqoNsh5yB0FeusDZNWYnaAhO63RJqNMhK0zHSZDRfohCyczUW2tUsHklfz4DU Ecmyhrb4qz2NveKWxkcE7wVUU3ZoFzr4u/Nr23dIaEadEu3mlKjoJ6zfMwGhD5kRCVchza JvndjOAY31o0m20C2ml3VOM8wRpU2QIK8hdPZYF/+A3a76+IjRCHaHrwtJ97cfQoFYBDQO yWCz/7a5Jt7/ta2ZFGpVEBkRJyTKv7s9BuT0H39hM2vG+YC1vdhfW+uGtVnasw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764682512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQFPbkZmbnLDkjwv4jVz9QE4aZgOufVhJ7/pdHtd/nk=; b=CdLWVGkC5oQq1N/OeNsAXzj9Nb3QhoCKIgWA2kLeTj6a2LaEKjf7M9p6XpteXV1UAGF9mQ iOgOyMHY+GcWkkFcqRvWVfQpE9te7mpNjPt2rvvLrTsr3egUahaw6Wv7pENh/5reJ7flqA 6fw1skS4n1YS19+SyWlzd5pG/HHlrLmpxc/2n8OsdKkZkp8SPzi7S65X0PtF8rK4GQONfc xhyzR9iS8xxSe0XZUoF9wtlUtR7hdebS0cAFEh4/AlbBDcigGHIuQHjnfyQdXLF7gx1S+J lqnsp4XoQqLpBIR4TMOq52GFkRJLp/jLaPNup3NYI9iKymVn/NmHuqUfiBZgnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764682512; a=rsa-sha256; cv=none; b=xiM/ZUXahZTOdEjvFSQpVu2Ev8IJgwYtazlU43Yjwy8F/MNFB53Fbv8a8F7b44Rxb0Sirc XiDLu84Bn5uuH4EcsxtYC6TxKLVJFPRvDFkV4RFIu5SN+Pqq0wcTmO9cqhLUQG/a2WdItv b+k4Y5zyxNvy8lnHSsd4VlVhRvkQCULgmll7rFNt+M8EJ7be/5uZsbLeFj/1NLu7eDfH5C c5lzpFOI+Oy2PBTGmX8Xng78//4e+9eK+hlpsTEPosFmI1IFtgoaejjdzgCrjBwCGRToUi 2CO9Ri/8KwxhD0lDMDkg8mKNRzORNV+TlbuS9WsS/nchMRmnmaiY0ppAo3YxPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLMG80dZrz17kL for ; Tue, 02 Dec 2025 13:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27ecc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 13:35:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: f417c9ed6642 - main - powerpc/_stdint.h: fix SIG_ATOMIC_{MIN,MAX,WIDTH} List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f417c9ed6642836c386c922d6e184b618d28127d Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 13:35:12 +0000 Message-Id: <692eeb10.27ecc.564ef7c4@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f417c9ed6642836c386c922d6e184b618d28127d commit f417c9ed6642836c386c922d6e184b618d28127d Author: Robert Clausecker AuthorDate: 2025-12-02 00:59:05 +0000 Commit: Robert Clausecker CommitDate: 2025-12-02 13:34:24 +0000 powerpc/_stdint.h: fix SIG_ATOMIC_{MIN,MAX,WIDTH} On powerpc/powerpc64, sig_atomic_t is an int, but was treated as if it was a long by . This was finally caught by the unit test added with 4a1c752 / D53831. Reported by: kib Reviewed by: kib, imp Approved by: markj (mentor) Fixes: c3e289e1ce8c9af8d14e9f727632e22b3bf901f9 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54026 --- sys/powerpc/include/_stdint.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 983db38ccf25..385c33389809 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -167,15 +167,15 @@ * ISO/IEC 9899:1999 * 7.18.3 Limits of other integer types */ +/* Limits of sig_atomic_t. */ +#define SIG_ATOMIC_MIN INT32_MIN +#define SIG_ATOMIC_MAX INT32_MAX + #ifdef __LP64__ /* Limits of ptrdiff_t. */ #define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX -/* Limits of sig_atomic_t. */ -#define SIG_ATOMIC_MIN INT64_MIN -#define SIG_ATOMIC_MAX INT64_MAX - /* Limit of size_t. */ #define SIZE_MAX UINT64_MAX #else @@ -183,10 +183,6 @@ #define PTRDIFF_MIN INT32_MIN #define PTRDIFF_MAX INT32_MAX -/* Limits of sig_atomic_t. */ -#define SIG_ATOMIC_MIN INT32_MIN -#define SIG_ATOMIC_MAX INT32_MAX - /* Limit of size_t. */ #define SIZE_MAX UINT32_MAX #endif @@ -217,13 +213,12 @@ */ #ifdef __LP64__ #define PTRDIFF_WIDTH INT64_WIDTH -#define SIG_ATOMIC_WIDTH INT64_WIDTH #define SIZE_WIDTH INT64_WIDTH #else #define PTRDIFF_WIDTH INT32_WIDTH -#define SIG_ATOMIC_WIDTH INT32_WIDTH #define SIZE_WIDTH INT32_WIDTH #endif +#define SIG_ATOMIC_WIDTH INT32_WIDTH #define WCHAR_WIDTH INT32_WIDTH #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ From nobody Tue Dec 2 15:02:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLPCM06Wtz6KYt0 for ; Tue, 02 Dec 2025 15:02:55 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 4dLPCJ69Lsz4520 for ; Tue, 02 Dec 2025 15:02:52 +0000 (UTC) (envelope-from wschnr@googlemail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of wschnr@googlemail.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=wschnr@googlemail.com Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-42e2e3c0dccso1546858f8f.2 for ; Tue, 02 Dec 2025 07:02:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764687771; x=1765292571; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=X8IuXSpfGR2RSmE1CcTDKX551BkuPzPYeER/TLh53k8=; b=P1lr8qw9zXXoFinU5MC7oQFGn45Jb+OWxzU4PTsMYi8Ked9LBe0jE0+Wr4yymcOtaV CyNW3X48I2nt2hqIFJbzv1Pit+GFmjKwOZkUxGaJU/X/cXktTAb8M6cDszhT6RdJdai0 xwNePSN5OljMRWyR0URt6i8QU4AjPyI4QqYMEAEiV9HOj9K/vXEr23BVcuOgzno7DLJ1 A1GcjZEnTf2HFet3HymTgYHxO3MuyJwvx+6Fsj5Y2Q5RFM5lf3HsO8hedTGfOofUVmvO 6tIv3yGDR+UmCIQZewvbGEehc/K9/T2LIDEQ/qkxTEFP6bj+TfDkBrrm5vhXIJWBhN8v u32Q== X-Forwarded-Encrypted: i=1; AJvYcCWmpadzRAClfkeaHwUmCkoQULxVdi6e6YFDZdpz6Al4q9e1GI1+FBxR4Bgi1zPdO0zfm6VBuenO605g3Wz1NifGnqfhVA==@freebsd.org X-Gm-Message-State: AOJu0YyMw2341faCK+eGQotrmmjI6muk22A/b9MDgMZEnJ8sP0DIegEK 7BMt4Mn4ByaWOSpCDe1RE/jatA8KMtjNUdL+ku2ZoN62vrXggXbW6sbveWkV5cVbrNkSlYGwIVZ nGqEnTdUchV046sufLunJvxS8GPtjFnw= X-Gm-Gg: ASbGncsmk0hzcuLtAIP0lDFNofCyPhQ82l8kF8Fw0/a+4B0VaWuZj7a6FtZA59Ow6Ri Ky1TTRBCAkWWJjp6rgZmACzNoS0TduCv+BfB0B+F8AHV88H/s9iKImgH8PiOygTqafe8h/fj6ws RyFkKew+caZR2IlGfPeTCWCqMt87TdW7UI4hDy7EwPNY5yB2HUGVcnq5DaYoNc1CHrg+fhIncY4 SJro5SxyQDz8XIO2LDmNV3hps6dWm4clCHTFbyTfedOTOCzPdKrmjk0dNvApR6misI47O/cEySb SlLLmtPYFQD0gPj/kVThqi/af4Tx0mB/tROmqWh+gPZcpGkBPA== X-Google-Smtp-Source: AGHT+IGS3IbH/aKalU7p1Nwk1E+wbPWfkzehqLfjfhzmrCzx381Zj9uBbS0y10KBHZrErGawuKOisssW6Ro/wE1x9Xo= X-Received: by 2002:a05:6000:240b:b0:42b:43b4:2870 with SMTP id ffacd0b85a97d-42cc1d0897cmr48051659f8f.26.1764687770968; Tue, 02 Dec 2025 07:02:50 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510140252.59E2qpmW046357@gitrepo.freebsd.org> In-Reply-To: <202510140252.59E2qpmW046357@gitrepo.freebsd.org> From: Wolfram Schneider Date: Tue, 2 Dec 2025 16:02:39 +0100 X-Gm-Features: AWmQ_bnKKPKmXqsE-QuDGXMh8wvJXwR-sBOFqt5zPc7TpJFD7N0xoiDZRDGvQC4 Message-ID: Subject: Re: git: 16155cccc4bf - main - packages: Compress in parallel To: Colin Percival Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/mixed; boundary="000000000000ba7dde0644f96368" X-Spamd-Bar: / X-Spamd-Result: default: False [-0.40 / 15.00]; MIME_BASE64_TEXT_BOGUS(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.96)[-0.956]; NEURAL_SPAM_MEDIUM(0.36)[0.361]; FORGED_SENDER(0.30)[wosch@freebsd.org,wschnr@googlemail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_BASE64_TEXT(0.10)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; FREEMAIL_ENVFROM(0.00)[googlemail.com]; HAS_ATTACHMENT(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[wosch@freebsd.org,wschnr@googlemail.com]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.50:from]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; BLOCKLISTDE_FAIL(0.00)[209.85.221.50:server fail]; R_DKIM_NA(0.00)[]; MISSING_XM_UA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.50:from]; FROM_HAS_DN(0.00)[] X-Rspamd-Queue-Id: 4dLPCJ69Lsz4520 --000000000000ba7dde0644f96368 Content-Type: text/plain; charset="UTF-8" On Tue, 14 Oct 2025 at 04:53, Colin Percival wrote: > > The branch main has been updated by cperciva: > > URL: https://cgit.FreeBSD.org/src/commit/?id=16155cccc4bf42a5a76806128e7ef637f9ae61fe > > commit 16155cccc4bf42a5a76806128e7ef637f9ae61fe > Author: Colin Percival > AuthorDate: 2025-10-12 21:44:14 +0000 > Commit: Colin Percival > CommitDate: 2025-10-14 02:50:52 +0000 > > packages: Compress in parallel > > The FreeBSD-base pkg repository is currrently dominated by a handful of > large packages: Out of a compressed repository size of ~960 MB, about > 160 MB is taken up by the FreeBSD-src package, 128 MB (on amd64) is > used by the FreeBSD-kernel-generic-dbg package, and 91 MB is used by > the FreeBSD-src-sys package. Consequently, running 'make packages -jN' > provides less benefit than one might hope, as most of the packages > finish building quickly, ultimately leaving the FreeBSD-src package > building by itself for a couple minutes while all the other CPUs are > idle. > > Pass -T${PKG_CTHREADS} to the 'pkg create' commands (with a default > of -T0) in order to instruct pkg's zstd compression to use multiple > threads. > > Testing on an EC2 r7i.48xlarge instance with -j192, this reduces the > time taken by 'make packages' from 6m17s to 1m39s; package creation > time itself (excluding the initial process of installing into world > and kernel staging directories) dropped from 5m37s to 59s. Great work! `make packages' is now twice as fast on my old macbook pro m1 (10 CPUs, 8P+2E, cross compiling), from 8.5min down to 4.5min. 100 seconds for installation, and 180 seconds for pkg. Most of the time is spent with the usual suspects, the toolchain and debug libs (WITHOUT_TOOLCHAIN and WITHOUT_DEBUG_FILES), see the CSV attachment. -Wolfram > > Reviewed by: ivy > MFC after: 3 days > Sponsored by: https://www.patreon.com/cperciva > Differential Revision: https://reviews.freebsd.org/D53053 > --- > Makefile.inc1 | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/Makefile.inc1 b/Makefile.inc1 > index e079a23552f1..a86dead09aa1 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -1964,6 +1964,7 @@ REPODIR?= ${OBJROOT}repo > PKG_FORMAT?= tzst > PKG_LEVEL?= -1 > PKG_CLEVEL?= ${"${PKG_FORMAT:Mtar}" != "":?:-l ${PKG_LEVEL}} > +PKG_CTHREADS?= 0 > PKG_REPO_SIGNING_KEY?= # empty > PKG_OUTPUT_DIR?= ${PKG_VERSION} > PKG_ABI_FILE?= ${WSTAGEDIR}/usr/bin/uname > @@ -2144,7 +2145,7 @@ create-source-src-package: _pkgbootstrap .PHONY > ${SSTAGEDIR}/src.ucl > ${PKG_CMD} -o ABI=${PKG_ABI} \ > -o OSVERSION="${SRCRELDATE}" \ > - create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ > + create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ > -M ${SSTAGEDIR}/src.ucl \ > -p ${SSTAGEDIR}/src.plist \ > -r ${SRCDIR} \ > @@ -2170,7 +2171,7 @@ create-source-src-sys-package: _pkgbootstrap .PHONY > ${SSTAGEDIR}/src-sys.ucl > ${PKG_CMD} -o ABI=${PKG_ABI} \ > -o OSVERSION="${SRCRELDATE}" \ > - create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ > + create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ > -M ${SSTAGEDIR}/src-sys.ucl \ > -p ${SSTAGEDIR}/src-sys.plist \ > -r ${SRCDIR} \ > @@ -2210,7 +2211,7 @@ create-world-package-${pkgname}: .PHONY > ' ${WSTAGEDIR}/${pkgname}.ucl > ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ > -o OSVERSION="${SRCRELDATE}" \ > - create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ > + create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ > -M ${WSTAGEDIR}/${pkgname}.ucl \ > -p ${WSTAGEDIR}/${pkgname}.plist \ > -r ${WSTAGEDIR} \ > @@ -2229,7 +2230,7 @@ create-sets-packages: .PHONY > @for manifest in ${WSTAGEDIR}/set-*.ucl; do \ > echo "--> Processing manifest: $$manifest"; \ > ${PKG_CMD} -o ABI=${PKG_ABI} -o OSVERSION="${SRCRELDATE}" \ > - create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ > + create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ > -M $$manifest \ > -o "${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}" \ > || exit 1; \ > @@ -2259,7 +2260,7 @@ create-dtb-package: .PHONY > ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ > ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ > -o OSVERSION="${SRCRELDATE}" \ > - create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ > + create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ > -M ${KSTAGEDIR}/${DISTDIR}/dtb.ucl \ > -p ${KSTAGEDIR}/${DISTDIR}/dtb.plist \ > -r ${KSTAGEDIR}/${DISTDIR} \ > @@ -2296,7 +2297,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap > ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ > ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ > -o OSVERSION="${SRCRELDATE}" \ > - create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ > + create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ > -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ > -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ > -r ${KSTAGEDIR}/${DISTDIR} \ > @@ -2339,7 +2340,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne > ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ > ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ > -o OSVERSION="${SRCRELDATE}" \ > - create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ > + create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ > -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \ > -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ > -r ${KSTAGEDIR}/kernel.${_kernel} \ -- Wolfram Schneider https://wolfram.schneider.org --000000000000ba7dde0644f96368 Content-Type: text/csv; charset="US-ASCII"; name="pkg-time.csv" Content-Disposition: attachment; filename="pkg-time.csv" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_miopc5dg0 dGltZTogcmVhbCAxMTQuNDIgdXNlciAyMTkuNDYgc3lzIDEuMTQgc3RhcnQ6IDE3NjQ1ODY5ODUu Mzc5MTgxMDAwIGVuZDogMTc2NDU4NzA5OS44MTk5NzAwMDAgZXhpdDogMCBtZXNzYWdlOiBwa2cg Y2xhbmctZGJnCnRpbWU6IHJlYWwgNzguOTQgdXNlciAzOC4xNyBzeXMgMS4yNSBzdGFydDogMTc2 NDU4NzA5MS44ODE1ODkwMDAgZW5kOiAxNzY0NTg3MTcwLjg0ODkwMjAwMCBleGl0OiAwIG1lc3Nh Z2U6IHBrZyByZXNjdWUKdGltZTogcmVhbCA2OS4wMiB1c2VyIDg3LjU1IHN5cyAwLjQ2IHN0YXJ0 OiAxNzY0NTg2OTg1LjM5MDA2NjAwMCBlbmQ6IDE3NjQ1ODcwNTQuNDMwODkzMDAwIGV4aXQ6IDAg bWVzc2FnZTogcGtnIGNsYW5nCnRpbWU6IHJlYWwgNTMuNDAgdXNlciAzMC4zMiBzeXMgMS4wNCBz dGFydDogMTc2NDU4Njk5Ni4wNjcwNDYwMDAgZW5kOiAxNzY0NTg3MDQ5LjQ5Njk5NTAwMCBleGl0 OiAwIG1lc3NhZ2U6IHBrZyBjbGlicy1kZXYKdGltZTogcmVhbCAzOS42NSB1c2VyIDE2LjQwIHN5 cyAwLjI0IHN0YXJ0OiAxNzY0NTg3MDYxLjU2OTUyMjAwMCBlbmQ6IDE3NjQ1ODcxMDEuMjUzMTYy MDAwIGV4aXQ6IDAgbWVzc2FnZTogcGtnIGxvY2FsZXMKdGltZTogcmVhbCAzNS45MCB1c2VyIDE3 LjAwIHN5cyAxLjMxIHN0YXJ0OiAxNzY0NTg3MDcxLjM3NjMxMjAwMCBlbmQ6IDE3NjQ1ODcxMDcu MzA0Njg2MDAwIGV4aXQ6IDAgbWVzc2FnZTogcGtnIG9wZW5zc2wtZGV2CnRpbWU6IHJlYWwgMzMu MDEgdXNlciAyNC42MiBzeXMgMC4xOSBzdGFydDogMTc2NDU4Njk4NS4zNzY4NTIwMDAgZW5kOiAx NzY0NTg3MDE4LjQxNTQyMTAwMCBleGl0OiAwIG1lc3NhZ2U6IHBrZyBjbGFuZy1kZXYKdGltZTog cmVhbCAzMS4yNSB1c2VyIDIwLjExIHN5cyAwLjExIHN0YXJ0OiAxNzY0NTg3MDU4LjA2MjE5MjAw MCBlbmQ6IDE3NjQ1ODcwODkuMzQxMTk3MDAwIGV4aXQ6IDAgbWVzc2FnZTogcGtnIGxsZGItZGJn CnRpbWU6IHJlYWwgMzEuMTUgdXNlciA0MC41OSBzeXMgMS40OSBzdGFydDogMTc2NDU4NzEwMy4z Mjg0ODkwMDAgZW5kOiAxNzY0NTg3MTM0LjUxNjk4NTAwMCBleGl0OiAwIG1lc3NhZ2U6IHBrZyB0 ZXN0cwp0aW1lOiByZWFsIDI4LjA2IHVzZXIgMTEuMzggc3lzIDAuMDkgc3RhcnQ6IDE3NjQ1ODY5 ODUuODEwMjM4MDAwIGVuZDogMTc2NDU4NzAxMy44OTUwNTYwMDAgZXhpdDogMCBtZXNzYWdlOiBw a2cgY2xpYnMtZGV2LWxpYjMyCg== --000000000000ba7dde0644f96368-- From nobody Tue Dec 2 15:23:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLPgQ0m4Kz6HcFy for ; Tue, 02 Dec 2025 15:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLPgQ031yz4BGv for ; Tue, 02 Dec 2025 15:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764689026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcCWAMVG0rOIjhX3PGfgxAIBpGlUqxK5AMC4qULYeYg=; b=H0GCwi289wQyV3QlmvlnFVF8r7BbSyBtX1TRbANUbpXTCCZm7siS9rxRJ/FQuRjOp93nG0 AdIcnGHOIBuBdUwttneYL4Wbddtj7/GjS8WBmy8yv2CJoFEf2MZZ9ojes3mBtyBjwVGH67 wIfErSeXuCmXA429xaP7n+iLcAjF7xAU5sDzIJwF1i6q4hDWxbLi0j7JXQiJ6Zk39f/sg8 VXan0HgKgmyvzPj0kvbVUxyz/kHKOqdtrhj7JTusmEqgrQlz/74PIYzhiGCA73VXhxVy+q Z5dG5io3nPRKrG7IFNSxbLd9chlV4F0ktQi8rXTVn4mHsio8QcBWw0S0edevZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764689026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcCWAMVG0rOIjhX3PGfgxAIBpGlUqxK5AMC4qULYeYg=; b=i5WCHeKN3YtI9zir2JxLHwy0viA6tSl/5zIKBwFz+HeIlj5XqTXHHe5JN878gNXjFjOiYo kmkEZOD2y3H9St1MUOEClMg3G1xvote60iSppb19GddfzUhah3dIvA6pbnbAyQMhcAQTIU WZYZmMQuQlw1fv9LU8nviAOAzKUMKt6sE2iv7UdHzDvqJ18eXmSQWjZNIeFqoyVHl75hxZ g5RnJeE1g92cRnwnmyNL625gX8wTGKqQ75hkTkVnWuQgqwrPwNN7TaKr/L8qDil+/1wZlL smVMPyRjwvLp2loAvrmJqfP9N8W6+WFYVgZ3dHNbqNziF+i9wA/pomIYGkpfuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764689026; a=rsa-sha256; cv=none; b=wRwWbbD9i+yHEbt0LDlXV1mNlPHa+wHu5pOxILa+rkYw4s1wXx4Xs3hfw3X5FHnayOH02V op19w5Yk7ONIkh9o7xaMUeRxeYBsNxlD/y5V0QSNy6z2lt+INixod/1u2o7to8/pGFDoOm nEGNo6rmvmaDHWRABEL5Iq/rDBf0GojaF4YwqCNmKgkIxMeQBCxij/zpeeMS796ufddkrD K0zi0KbYdLP3pSZqw6V3iTYuugvYVxwAKEVosYYtn6STOL21/05husEZwAvslIA/k64hii +70NGPu8kug1UEaP4sGZF0EsnI8GglcNBQmx10a4eMo8kV1ZJdrrB7O4Zzd7NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLPgP6XZ7z1Bn4 for ; Tue, 02 Dec 2025 15:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33d12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 15:23:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 07d5a9b1b2dd - main - sqlite3: Update to 3.50.4 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07d5a9b1b2dd95d95137c6c2afcb84ad40c05b75 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 15:23:45 +0000 Message-Id: <692f0481.33d12.519ac31b@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=07d5a9b1b2dd95d95137c6c2afcb84ad40c05b75 commit 07d5a9b1b2dd95d95137c6c2afcb84ad40c05b75 Merge: f417c9ed6642 e7e917ee3cf2 Author: Cy Schubert AuthorDate: 2025-12-02 15:22:26 +0000 Commit: Cy Schubert CommitDate: 2025-12-02 15:22:26 +0000 sqlite3: Update to 3.50.4 Release notes at https://www.sqlite.org/releaselog/3_50_4.html. Obtained from: https://www.sqlite.org/2025/sqlite-autoconf-3500400.tar.gz Merge commit 'e7e917ee3cf2b3010b1c511c6ebaf8b65b983ad7' contrib/sqlite3/VERSION | 2 +- contrib/sqlite3/sqlite3.c | 203 +++++++++++++++++++++++++----------------- contrib/sqlite3/sqlite3.h | 90 +++++++++---------- contrib/sqlite3/sqlite3.pc.in | 2 +- contrib/sqlite3/sqlite3rc.h | 2 +- 5 files changed, 170 insertions(+), 129 deletions(-) From nobody Tue Dec 2 16:01:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLQW32MJgz6Hghx for ; Tue, 02 Dec 2025 16:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLQW31Lb8z4Q4d for ; Tue, 02 Dec 2025 16:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764691295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yLDNtRd+VnlDM5wC0AOz/fV2GBYLY2v3eAoHJv12HI8=; b=qbZMtfAWBGEhFud6cR2dfPPTnJsC+BMhcEIp4sZAVPKc/FgGJVxDilecHrKWlBFFf0+5aO DwkeGbPteQSkOmSrZKmFVvRMCHoN6ueu4dWiMMldDVOu3lEw07iHBmD6gh1hV1ArmXK4YE DNlmLaGZUtf7scA232eZ7dF+sVRwohSFEW7kWQ17ZzeWIFZOJ6dlJSKgqdecbynQNsPnCH AKpXE497Iq9yWlqbFTMwLQHTBuQDEi1qUpDGU/PAlIAaX40sdr4x9fASX4vk15PMFsdWWl YJPWhTK/Hg1rcp4z6dGY/2foVwhQAJcgVqjWmYXP0T5PRZcMc/jyYtqHAbCUKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764691295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yLDNtRd+VnlDM5wC0AOz/fV2GBYLY2v3eAoHJv12HI8=; b=nrrZMq40fSUuxhno7IW4pS5KjNDjQQzy+55zwTaP7OIHJ5eS0M3k6OHnRXn1oBWVC35lLa 5jmZ0IPYkIpageOMpqgorfyv8ZsTONMGMfmEVo8Dkz0vUIet8vlKnBufT2PgVuaeA3A08a jhNSaj2vGbkTA4GZj1JK1KsX3rW+X2PRYrmO1Dg0FmHUXUJ3lR7EoxpeoYIz3Qb9C0TrOv BN31MF5Ekt/57L5gHq8sFbmrraKbLgWgF2A2KlVT5dkSI0Dw+yUeJe0COKmhUMMhoiw+7H +se74LUqrkuan3H7brO5u8BZPuCUW8ty0n2mNruUnHOwTt0bJ1CPv0pCS32diA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764691295; a=rsa-sha256; cv=none; b=neVl3sBybOypApZh2GXv78uekMbxMm3rwCiZNDpy0iCTxg8AZhKLDpICH272lepM2Noga0 F3ak9rX/JAroPeEsj1XUPQLAMGJuoWlDmV9+ELvawo3sHjHKfeGXUwZi8arEg0TBrpCUMZ pZ451Hyki+CxQ9ZulAcqcSzJyyTVEQblblyyD4suCsmMrl2gcXpuID3QdK5Fy6uBBQlNs0 QJgzQRWBuVkrB9xNHHmh59oOX3ZpklLpeMU2FMUr53O/MF/9fZJg5x3Z1La03zawYhp2X2 Cey+ulKyZyXBsUyW0bT3VVKvy97r488dqfZTNBVCf+jY2DBZl9Ig3WqBZLXM0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLQW30sKpz1CmS for ; Tue, 02 Dec 2025 16:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3878d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 16:01:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 44d6df4f65b1 - main - nvme: Use memcpy instead of memmove in nvme_cdata_get_disk_ident List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44d6df4f65b1441cf9cd9f12cd41edd52205d084 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 16:01:35 +0000 Message-Id: <692f0d5f.3878d.278c8a27@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=44d6df4f65b1441cf9cd9f12cd41edd52205d084 commit 44d6df4f65b1441cf9cd9f12cd41edd52205d084 Author: John Baldwin AuthorDate: 2025-12-02 15:57:08 +0000 Commit: John Baldwin CommitDate: 2025-12-02 15:57:08 +0000 nvme: Use memcpy instead of memmove in nvme_cdata_get_disk_ident These buffers should not overlap. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D53842 --- sys/dev/nvme/nvme.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index b696cc6aa697..b09fa44b0329 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -2005,7 +2005,7 @@ nvme_cdata_get_disk_ident(const struct nvme_controller_data *cdata, uint8_t *sn) _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, "NVME serial number too big for disk ident"); - memmove(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH); + memcpy(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH); sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; for (int i = 0; sn[i] != '\0'; i++) { if (sn[i] < 0x20 || sn[i] >= 0x80) From nobody Tue Dec 2 16:38:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLRKQ6BVvz6HkZB; Tue, 02 Dec 2025 16:38:18 +0000 (UTC) (envelope-from des@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLRKQ58kSz3JQZ; Tue, 02 Dec 2025 16:38:18 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764693498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1/U5N+E8+ZkLiqmIl8pO+5zYtAaMXfYh1l6uVT9T7eY=; b=NrMcvXFYWozJwxmymdlxtTSHVcBaRAaxhUZrlwKVR2rJ8kQwprKAzZz5sAJi+65dIYcMIS dXFLPwTjyw5xtJqWHjydx8uOE/MDRGtnm9CAFYkOEn5IpYnqeCUAbGMoPMQZeAxV31cWrC kaqLBFeDK6u7LjR9m1YEcQC7Behxnn4Pk3Lej0rxZqjvemmKZhfSjkeKAsWjYGc+khXYpK knWTQs4tNS+aBjF3WpNzhiDUclPyabgiJKsWAMLSVe/JAr4zJcZlMjYWrGaAL8G8TiQ+vW O3nzxlZFVEOOEcg1pz/bu3jOTLdvWTH2WTX0HFy9Xoeu20c5zIb5gqb8XKLgWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764693498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1/U5N+E8+ZkLiqmIl8pO+5zYtAaMXfYh1l6uVT9T7eY=; b=CcFquLV+OL/ReXasGjhpOxXMwK8TeesgvJEgBz36Sj06pEmUCA5FZ04F7A/TWq0YzFaTGb e3nYScrslQBva7rtb9bu3NkgHwho8M27cd0bT7zYv9QL9XdYH+51z8zrzanQKp72c7OjJc 3FG1YmKNhMqt0TfW4hfb8e45yx1FnsU7mJyBH0kWKgG1/LDPS3/sO9huSmmRtjYBGrgOC0 TwWRq2YUAF6FYyOsmMFNe6dar9FUyFS2bch7ORI5cn+WNKjG3kTqOVUNR2hbPxRpm3VZX7 c1BfGUsWAT5ktfs7iGoiNm+6UnbRgneURMZAsvg3xTnbzO4NTMjFXuIdvKzNGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764693498; a=rsa-sha256; cv=none; b=mo3wIM6raexffPsVEl9u1L0jJi1m6DVzYWJfaDUoXDUcos9b1O32Vq8KQZ88zTkwLR8X4L vzpzTcOttu9TzIYqVhRA9D/iwvXNetVlvdy3zFbVzkvK7oLpTlHQDQ7kpCYyFoBqrnIgn2 +6YnjlzUlLTFw8NDTdp3hYBx3YcagW4PW9bPszceifkohg0T9XSwY0oSVpE2wdmt3oxPLO reShi3X6G0h3fHQtRVVKANFf/yuQw9d7zMgC1Vcl4IVqvarlYAcSoboGwx9QkPjS3u213y iJxz9ag72xRcBx8PCDd7NTZquEgccr/+UuBGrEA3Kvq1AF8XQknE374yDQhx0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (2a01cb0585090500922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8509:500:922e:16ff:fef1:acef]) (using TLSv1.3 with cipher TLS_AES_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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dLRKQ3plxzwZK; Tue, 02 Dec 2025 16:38:18 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 3B3998F22C; Tue, 02 Dec 2025 17:38:17 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Robert Clausecker Cc: Jessica Clarke , Kristof Provost , Robert Clausecker , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 2fb8cbc6ef1b - main - libc/tests: add stdbit test framework and unit tests In-Reply-To: (Robert Clausecker's message of "Mon, 1 Dec 2025 16:31:19 +0100") References: <692c9966.26e27.70621b5b@gitrepo.freebsd.org> <3E139664-C0CE-4BB9-9225-66D7D44D644E@FreeBSD.org> <6903AA87-20BC-4060-A199-4100FC7CD8EB@freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Tue, 02 Dec 2025 17:38:17 +0100 Message-ID: <86ecpchm9y.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Robert Clausecker writes: > I ran "make check" in lib/libc/tests/stdbit and it seems to have passed. > I was not aware that this is insufficient. I will develop a fix and add = it. > A guide on how to add a new directory to the test suite would also be nic= e. This is , feel free to comment if you have any suggestions, I'll try to get around to it this weekend. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Tue Dec 2 18:46:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLV9t3SZqz6Hx0x for ; Tue, 02 Dec 2025 18:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLV9t2tKTz3jXN for ; Tue, 02 Dec 2025 18:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764701218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JF1tC5d5wzNPo2SrDSQXjNlKqH8WSaRvNXMjs5Xx65o=; b=guFr7A0i7hoUwKFjD2Cp5AEUV0B1B+E2SCWqzsn+yobplwLOE+Hgy2LtPlF2FfHwktvhbS 7T1r5+Shls3Te3rTfemCJZeVZBCi6SmzvfT9hPFHbwSNHCa3vplHBFoVZZfppN4y6P6sKe uC+QS4i4zLGw4a3dOp+oEJJ2f8uN33lhYWKukw48dmsya4LWURjIiBkA47kvDx22j/vhK0 EvK7N5k2hEG234c9xFE+FtJhy0bOPgGVkU3Rn2vZG/7jhXG7GJ7pUpc4OqpFXG+kn+6Vg6 mEJDnhJRe0SRQhx6UNflITfWeuDOxKSvqI0DqGrn2i3H0+zVUoS094VUTwnjMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764701218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JF1tC5d5wzNPo2SrDSQXjNlKqH8WSaRvNXMjs5Xx65o=; b=nc1HiUm/s/pDUkRyriP+ovaLP/dqLn0Ff/r+yF8Ycu9VPj3tP5xs+5YtOnUla5+iM5VIsP gYmyVYeOdyQ6XpdXDEUKBdbyjsYDOW6muGg5H2kJ6bNGQ9YhNbqnCzKzG6CRjysIhL3Fov ilQxpBEzK6PJQO+dbqUzhMZe25IMPK72+7TBy6X1HcfmWSWbQH8H+I5XR5bKSerALt7mPK nDsBzD89CcRLIRmSIBLcO70cw6+aXQMogbRarsGtkxbg+/Rxr/nEmVwDgJcd/kYB20jEeV BNof9OtCHsUuXzU0Od7sOsMY/Jp9DDxuENQwzMJmXiR2tMY0U1B6jCIw5OzwzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764701218; a=rsa-sha256; cv=none; b=FkUgMAZ37mF2pqJC5SYMkhM3GGOR0kv+A2QYJE74dZaA9Hbh+k0CNcFjlTkGxpTm+jyhEm OSpMPfffOOLz3w6bJj9kXxhV9/YaTnbv41AG7hBIyCOBHm8Vna86JULO4dOr625zU5+yvr eYTnScK6mNHUSdG/Ey9Z98lk/qHUfaW/kGEQ4pk0cGhifU0lhqouudpT79/aHGI9QfOn+M iXmmt/Udlf1bFcXRetw7MyeSA31bqm54D374s0HdAxlxrnwHs4t6/DsPIIHbjLiftAYUwB PolJnYOszjpr5tuQyFxfxouakMsERRtax5IVx3AwQfoWG+EpLYYm3o5qxUQGdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLV9t29y1z1HfS for ; Tue, 02 Dec 2025 18:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e4b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 18:46:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ed29ffd396e5 - main - LinuxKPI: pci: undo the pci_resource_len() check in lkpi_pci_request_region() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed29ffd396e522a45ab1980c12a75b3409b51712 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 18:46:58 +0000 Message-Id: <692f3422.e4b4.3f5f2017@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ed29ffd396e522a45ab1980c12a75b3409b51712 commit ed29ffd396e522a45ab1980c12a75b3409b51712 Author: Bjoern A. Zeeb AuthorDate: 2025-12-02 16:04:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-02 18:46:20 +0000 LinuxKPI: pci: undo the pci_resource_len() check in lkpi_pci_request_region() Creating non-passthru SR-IOV interfaces on a mlx5en(4) failed. The problem lies in the pci_resource_len() call but not that the BAR length is tmeporary 0 but in that we call lkpi_pci_get_bar() with a true argument which will create the BAR resource for us and report the approriate length back. However, the later call to bus_alloc_resource_any() will then fail given the resource already exists. Restore the previous behaviour and let bus_alloc_resource_any() do the work. Adjust the return values from -ENODEV to -EBUSY to match callers expectations. In linuxkpi_pcim_request_all_regions(), like in linuxkpi_pci_request_regions(), filter out the -EBUSY errors as "not an error" and try the next bar. This also seems to be consistent with the expectations of the callers. PR: 290793 Reported by: David BOYER (jcduss13 gmail.com) Tested on: mlx5en, iwlwifi, mt7921 Reviewed by: kib Fixes: 7e21158d44cd "implement [linuxkpi_]pcim_request_all_regions()" Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53902 --- sys/compat/linuxkpi/common/src/linux_pci.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 8507a59a8df3..fb3f648df496 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1223,13 +1223,6 @@ lkpi_pci_request_region(struct pci_dev *pdev, int bar, const char *res_name, if (!lkpi_pci_bar_id_valid(bar)) return (-EINVAL); - /* - * If the bar is not valid, return success without adding the BAR; - * otherwise linuxkpi_pcim_request_all_regions() will error. - */ - if (pci_resource_len(pdev, bar) == 0) - return (0); - /* Likewise if it is neither IO nor MEM, nothing to do for us. */ type = pci_resource_type(pdev, bar); if (type < 0) return (0); @@ -1241,7 +1234,7 @@ lkpi_pci_request_region(struct pci_dev *pdev, int bar, const char *res_name, device_printf(pdev->dev.bsddev, "%s: failed to alloc " "bar %d type %d rid %d\n", __func__, bar, type, PCIR_BAR(bar)); - return (-ENODEV); + return (-EBUSY); } /* @@ -1285,7 +1278,7 @@ linuxkpi_pci_request_regions(struct pci_dev *pdev, const char *res_name) for (i = 0; i <= PCIR_MAX_BAR_0; i++) { error = pci_request_region(pdev, i, res_name); - if (error && error != -ENODEV) { + if (error && error != -EBUSY) { pci_release_regions(pdev); return (error); } @@ -1300,7 +1293,7 @@ linuxkpi_pcim_request_all_regions(struct pci_dev *pdev, const char *res_name) for (bar = 0; bar <= PCIR_MAX_BAR_0; bar++) { error = lkpi_pci_request_region(pdev, bar, res_name, true); - if (error != 0) { + if (error != 0 && error != -EBUSY) { device_printf(pdev->dev.bsddev, "%s: bar %d res_name '%s': " "lkpi_pci_request_region returned %d\n", __func__, bar, res_name, error); From nobody Tue Dec 2 18:46:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLV9v4xcyz6HwtN for ; Tue, 02 Dec 2025 18:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLV9v2wDGz3jD9 for ; Tue, 02 Dec 2025 18:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764701219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JFV1xri6SXb+vg9OfKE14lxSyH4YXF4wgFzMHwxkjtc=; b=VaWr03YcM+Pk9ZfTjak1fxJ/m+axwCH0pOs3pg5j7VxwCcaZ4MB9BbB+r7WwIgBzjQtV2h 4OR/ZsSU9D/qoYgdvljnFRYJirI5tERIcHGtIo6jxvVrBNLLmwbphEFJxBHCMAvb3Zvy4j FJIlE7bUvseip1VmEoWlBvj+dBIG9aSSbdABn7DcVQsyLwgN0C3EYS0Gg7vt0ARPBl63Qo j8q0mvSHhCltCI8Wey9YqligpKuQBPvlb7hc2+PLd+UaRBxPPuUBhmXtzBxXqmlxjdX30v JQX4H6tPlmoRGF55iw3IWXCpL91m/kK6MZX1zsziiLF5WjUM1lL4ZJ3ngqiqQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764701219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JFV1xri6SXb+vg9OfKE14lxSyH4YXF4wgFzMHwxkjtc=; b=qKXuyANdLzyoWqzsNpBmNEIcA7CHjwelgFpZDhX3Ps+EC/xThLXzG2iY/GEHHmW2lvJm8P Zm+T28Fja7XHNqJKG8E2uhy+jQoAR1rrzpI7R8J8/UF58XEhezmL4YG6I3acOXvj5eMwqP G25GDGwQXgvEEUXXjNjGba6j22ph/WdFP5zvxcb2VZChgyl/ewwrt3b5BWdWng16DGKnHw ulFIbtENCrUFgmorNaiR/DYQuzu+nDZFEIuAj/pu/PtCjydIKVgnTqDrV4f6U4Oj3ojOzI NbgGUWCXxIP/GcbcF7kduteuw33uFadYbdnEQfkWGHItmUax9kBYiimabmyypg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764701219; a=rsa-sha256; cv=none; b=JD2ByJihrAms0/ipWo8jpUP4l+yoNWHIytpc/nljDdTZw8zsgOlVDIhpSefGPE91VCqFWO eOYB5mCnKJKxvuO8SjFHRfLmGBAJI6x+AFEjSi1LHeljlqTwIq5XGCYyI59uIIdhq2ujXW lA0datEjhJRjWTiEUrK0JEelMlHqUSzmiWmXkJ608X42RB7+OBTgs+jKNGW5XYH1XtUxOh qrTQcy6MTdlIIuQXTXPcxtr0J/YBbpHTddBjDKq5yTztpwx77jgTYPdWbHF/IndPf35NOb C1TDduH9kFAJxUxbqO8HIkmOGBUyVQhKVfF2cltRwT/6Yunz3wbiXwwFUMpxYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLV9v2S3cz1HqL for ; Tue, 02 Dec 2025 18:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f30b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 18:46:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: adb4901ac9ae - main - LinuxKPI: 802.11: when synching HT and VHT cap, mask rx_mcs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adb4901ac9ae6c2ceb4194d139ed3176f6ed5e55 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 18:46:59 +0000 Message-Id: <692f3423.f30b.3822fc3d@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=adb4901ac9ae6c2ceb4194d139ed3176f6ed5e55 commit adb4901ac9ae6c2ceb4194d139ed3176f6ed5e55 Author: Bjoern A. Zeeb AuthorDate: 2025-11-28 23:10:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-02 18:46:44 +0000 LinuxKPI: 802.11: when synching HT and VHT cap, mask rx_mcs When we sync the sta data, mask the rx_mcs with what the hardware is able to do so that we do not leave, e.g., a 2nd stream enabled on a 1x1 chipset. iwlwifi(4) has a further check for the smps_mode to limit to NSS=1 but I believe that is historic and not actually in use anymore. This fixes firmware crashes on TLC updates with nss=1 but the nss=2 array index also being populated (with HT/VHT80/160 mcs information): data being populated: iwlwifi0: 0x20101A0D | ADVANCED_SYSASSERT iwlwifi0: 0x00000006 | umac data1 iwlwifi0: 0x00000001 | umac data2 iwlwifi0: 0x000003FF | umac data3 iwlwifi0: 0x____050F | last host cmd Reported by: Claudio Zumbo (claudiozumbo gmail.com), Erik Power Tested by: Claudio Zumbo, Erik Power (eppower umich.edu) PR: 290622 MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/compat/linuxkpi/common/src/linux_80211.c | 99 ++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 28 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 8b1f5f0e0399..8098d02da1a9 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -128,11 +128,11 @@ SYSCTL_INT(_compat_linuxkpi_80211, OID_AUTO, debug, CTLFLAG_RWTUN, #define UNIMPLEMENTED if (linuxkpi_debug_80211 & D80211_TODO) \ printf("XXX-TODO %s:%d: UNIMPLEMENTED\n", __func__, __LINE__) -#define TRACEOK() if (linuxkpi_debug_80211 & D80211_TRACEOK) \ - printf("XXX-TODO %s:%d: TRACEPOINT\n", __func__, __LINE__) +#define TRACEOK(_fmt, ...) if (linuxkpi_debug_80211 & D80211_TRACEOK) \ + printf("%s:%d: TRACEPOINT " _fmt "\n", __func__, __LINE__, ##__VA_ARGS__) #else #define UNIMPLEMENTED do { } while (0) -#define TRACEOK() do { } while (0) +#define TRACEOK(...) do { } while (0) #endif /* #define PREP_TX_INFO_DURATION (IEEE80211_TRANS_WAIT * 1000) */ @@ -474,12 +474,14 @@ lkpi_sync_chanctx_cw_from_rx_bw(struct ieee80211_hw *hw, #if defined(LKPI_80211_HT) static void -lkpi_sta_sync_ht_from_ni(struct ieee80211_vif *vif, struct ieee80211_sta *sta, - struct ieee80211_node *ni) +lkpi_sta_sync_ht_from_ni(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_sta *sta, struct ieee80211_node *ni) { struct ieee80211vap *vap; uint8_t *ie; struct ieee80211_ht_cap *htcap; + struct ieee80211_sta_ht_cap *ht_cap, *sta_ht_cap; + enum nl80211_band band; int i, rx_nss; if ((ni->ni_flags & IEEE80211_NODE_HT) == 0) { @@ -513,13 +515,23 @@ lkpi_sta_sync_ht_from_ni(struct ieee80211_vif *vif, struct ieee80211_sta *sta, * MCS sets from the Rx MCS Bitmask; then there is MCS 32 and * MCS33.. is UEQM. */ + band = vif->bss_conf.chanctx_conf->def.chan->band; + ht_cap = &hw->wiphy->bands[band]->ht_cap; + sta_ht_cap = &sta->deflink.ht_cap; rx_nss = 0; for (i = 0; i < 4; i++) { - if (htcap->mcs.rx_mask[i] != 0) + TRACEOK("HT rx_mask[%d] sta %#04x & hw %#04x", i, + sta_ht_cap->mcs.rx_mask[i], ht_cap->mcs.rx_mask[i]); + sta_ht_cap->mcs.rx_mask[i] = + sta_ht_cap->mcs.rx_mask[i] & ht_cap->mcs.rx_mask[i]; + /* XXX-BZ masking unequal modulation? */ + + if (sta_ht_cap->mcs.rx_mask[i] != 0) rx_nss++; } if (rx_nss > 0) { - sta->deflink.rx_nss = rx_nss; + TRACEOK("HT rx_nss = max(%d, %d)", rx_nss, sta->deflink.rx_nss); + sta->deflink.rx_nss = MAX(rx_nss, sta->deflink.rx_nss); } else { sta->deflink.ht_cap.ht_supported = false; return; @@ -548,14 +560,15 @@ lkpi_sta_sync_ht_from_ni(struct ieee80211_vif *vif, struct ieee80211_sta *sta, #if defined(LKPI_80211_VHT) static void -lkpi_sta_sync_vht_from_ni(struct ieee80211_vif *vif, struct ieee80211_sta *sta, - struct ieee80211_node *ni) +lkpi_sta_sync_vht_from_ni(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_sta *sta, struct ieee80211_node *ni) { + struct ieee80211_sta_vht_cap *vht_cap, *sta_vht_cap;; enum ieee80211_sta_rx_bandwidth bw; + enum nl80211_band band; uint32_t width; int rx_nss; - uint16_t rx_mcs_map; - uint8_t mcs; + uint16_t rx_map, tx_map; if ((ni->ni_flags & IEEE80211_NODE_VHT) == 0 || !IEEE80211_IS_CHAN_VHT_5GHZ(ni->ni_chan)) { @@ -609,18 +622,49 @@ lkpi_sta_sync_vht_from_ni(struct ieee80211_vif *vif, struct ieee80211_sta *sta, sta->deflink.bandwidth = bw; skip_bw: + band = vif->bss_conf.chanctx_conf->def.chan->band; + vht_cap = &hw->wiphy->bands[band]->vht_cap; + sta_vht_cap = &sta->deflink.vht_cap; + rx_nss = 0; - rx_mcs_map = sta->deflink.vht_cap.vht_mcs.rx_mcs_map; + rx_map = tx_map = 0; for (int i = 7; i >= 0; i--) { - mcs = rx_mcs_map >> (2 * i); - mcs &= 0x3; - if (mcs != IEEE80211_VHT_MCS_NOT_SUPPORTED) { - rx_nss = i + 1; - break; + uint8_t card, sta; + + card = (vht_cap->vht_mcs.rx_mcs_map >> (2 * i)) & 0x3; + sta = (sta_vht_cap->vht_mcs.rx_mcs_map >> (2 * i)) & 0x3; + if (sta != IEEE80211_VHT_MCS_NOT_SUPPORTED) { + if (card == IEEE80211_VHT_MCS_NOT_SUPPORTED) + sta = IEEE80211_VHT_MCS_NOT_SUPPORTED; + else { + sta = MIN(sta, card); + rx_nss = i + 1; + } + } + rx_map |= (sta << (2 * i)); + + card = (vht_cap->vht_mcs.tx_mcs_map >> (2 * i)) & 0x3; + sta = (sta_vht_cap->vht_mcs.tx_mcs_map >> (2 * i)) & 0x3; + if (sta != IEEE80211_VHT_MCS_NOT_SUPPORTED) { + if (card == IEEE80211_VHT_MCS_NOT_SUPPORTED) + sta = IEEE80211_VHT_MCS_NOT_SUPPORTED; + else + sta = MIN(sta, card); } + tx_map |= (sta << (2 * i)); + } + TRACEOK("VHT rx_mcs_map %#010x->%#010x, tx_mcs_map %#010x->%#010x, rx_nss = %d", + sta_vht_cap->vht_mcs.rx_mcs_map, rx_map, + sta_vht_cap->vht_mcs.tx_mcs_map, tx_map, rx_nss); + sta_vht_cap->vht_mcs.rx_mcs_map = rx_map; + sta_vht_cap->vht_mcs.tx_mcs_map = tx_map; + if (rx_nss > 0) { + TRACEOK("VHT rx_nss = max(%d, %d)", rx_nss, sta->deflink.rx_nss); + sta->deflink.rx_nss = MAX(rx_nss, sta->deflink.rx_nss); + } else { + sta->deflink.vht_cap.vht_supported = false; + return; } - if (rx_nss > 0) - sta->deflink.rx_nss = rx_nss; switch (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_MAX_MPDU_MASK) { case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454: @@ -642,18 +686,18 @@ lkpi_sta_sync_from_ni(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, struct ieee80211_node *ni, bool updchnctx) { -#if defined(LKPI_80211_HT) - lkpi_sta_sync_ht_from_ni(vif, sta, ni); -#endif -#if defined(LKPI_80211_VHT) - lkpi_sta_sync_vht_from_ni(vif, sta, ni); -#endif - /* * Ensure rx_nss is at least 1 as otherwise drivers run into * unexpected problems. */ - sta->deflink.rx_nss = MAX(1, sta->deflink.rx_nss); + sta->deflink.rx_nss = 1; + +#if defined(LKPI_80211_HT) + lkpi_sta_sync_ht_from_ni(hw, vif, sta, ni); +#endif +#if defined(LKPI_80211_VHT) + lkpi_sta_sync_vht_from_ni(hw, vif, sta, ni); +#endif /* * We are also called from node allocation which net80211 @@ -6237,7 +6281,6 @@ lkpi_ic_getradiocaps_ht(struct ieee80211com *ic, struct ieee80211_hw *hw, #endif IMPROVE("PS, ampdu_*, ht_cap.mcs.tx_params, ..."); - ic->ic_htcaps |= IEEE80211_HTCAP_SMPS_OFF; /* Only add HT40 channels if supported. */ if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) != 0 && From nobody Tue Dec 2 19:47:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLWWL0GQlz6J3Mq for ; Tue, 02 Dec 2025 19:47: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLWWK5QmRz3tKm for ; Tue, 02 Dec 2025 19:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764704829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W2R5aR6zELokagXUAxtD79b2jm6VAqiCUUcMDm1zBJM=; b=WRr2ugZciLAOrQbVaA5oaLdHk4+1mF1MEGPrIfy+0OrWIT3NvaygBa/Y56RrMIuf9nPjSQ JmObf0CGy799cVlavO97lHQZ/r98BcYgAjlLgLKKWEUlnsJwlgvOKgwBxryJ8x1D02lN6F QYnTN9PsLkpncd7Cou7LadT/25KeGFlmmw6+Ylcu1krR6UYuvNQbQApb24Okz1FHCarq8a xs7p9Dto76IEHC1MAuYYzhJ3o/SkgV/tSotStTev+qkNzC/dKqVQyJ2PB5lZ6cRHUvwsUV 1d3mmsJxFfU3HjldQAT2PHtBTRWSky1E+sV18TyJEdPsPeCTgxYvMGnBzewmYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764704829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W2R5aR6zELokagXUAxtD79b2jm6VAqiCUUcMDm1zBJM=; b=TmLRl9EU8yKQUp7EHnJi9myNN3tJRkcoQ20+olDckHBmlPATzwlDWhG9xz9Z/ibDKjIo0E cnRq/J+GUVxwwVJeX9k124ngCSCxQa8L4M7IIzpgLafdYQgurzRQvhhDoBM2mbr4YaQD1I ouYDYPF2GAhoTAi3erQ78RljxpUipkejoazUhUsXV+f/O//EPPcAIC+hEvR5JmbqJraX1w nIH/dY/asnKsnPLIJw8RKBK/aPiHLcySnrt6NmUpwWye95v/7c5hs1wQ2QWSZy2aTUXb/c xp0ZTZaVBvr8jm6og8kS1DRUDY9/RbuYftUaluJMmWrohF0wW6TUWH8u+TfPBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764704829; a=rsa-sha256; cv=none; b=AG2ZQLc9i/O7TswkmNEY+FEOWAJDqMPkRmGjVjhUIAUUMg9YxmoajnxkjG5t6REJqDAjuP dSS4GEm8MjAvGqleyCO8rKMcyJ1bUgxZluotbi7QCda/26r3rgzaNy0fbLcjMsbLMCNgPX 5NQK2Vbp3rpqPh846u4irrxbs/XfmHxK7ScaZAqLbGkuU8zSPTfpS8yvhuGP7vjYs0fmAG yidMHejuVGGZCko2XKBaBJpxHaZeOu6RuOlAMhHCNwDoxS6UUXgAMkHgainJbJFj8hOwM/ /xy9yvpRi1pWtjoQlPcfqLP6m+uXnyCqwE+vH0CSdQskHEkLsjFqyxCx6KsNyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLWWK4hGdz1KQ2 for ; Tue, 02 Dec 2025 19:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 19:47:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 39b2ca9ec99e - main - freebsd-base.7: Rewrite table into a tagged list List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39b2ca9ec99eded0b248082dcec6c843f40330a8 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 19:47:09 +0000 Message-Id: <692f423d.26a40.790ab7f6@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=39b2ca9ec99eded0b248082dcec6c843f40330a8 commit 39b2ca9ec99eded0b248082dcec6c843f40330a8 Author: Alexander Ziaee AuthorDate: 2025-12-02 17:21:08 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-02 19:46:53 +0000 freebsd-base.7: Rewrite table into a tagged list The table is not playing nicely with https://man.freebsd.org/freebsd-base MFC after: 3 days Reviewed by: pauamma@gundo.com Differential Revision: https://reviews.freebsd.org/D54036 --- share/man/man7/freebsd-base.7 | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index f84cc7239a1d..07cd7ab5656c 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -67,15 +67,24 @@ package. For the package .Sy FreeBSD-foo , the following subpackages may be available: -.Bl -column "FreeBSD-foo-dev-lib32" "Description" -.It Sy "Package name" Ta Sy "Description" -.It FreeBSD-foo Ta Base files for the package (typically executables) -.It FreeBSD-foo-lib Ta Native runtime libraries -.It FreeBSD-foo-lib32 Ta 32-bit compatibility runtime libraries -.It FreeBSD-foo-dev Ta Development files (headers and static libraries) -.It FreeBSD-foo-dev-lib32 Ta 32-bit development files -.It FreeBSD-foo-dbg Ta Debugging symbols -.It FreeBSD-foo-man Ta Manual pages. +.Pp +.Bl -tag -width "FreeBSD-foo-dev-lib32" -compact +.It Sy "Package name" +.Sy "Description" +.It FreeBSD-foo +Base files for the package (typically executables) +.It FreeBSD-foo-lib +Native runtime libraries +.It FreeBSD-foo-lib32 +32-bit compatibility runtime libraries +.It FreeBSD-foo-dev +Development files (headers and static libraries) +.It FreeBSD-foo-dev-lib32 +32-bit development files +.It FreeBSD-foo-dbg +Debugging symbols +.It FreeBSD-foo-man +Manual pages. Manual pages are only packaged separately if the .Sy WITH_MANSPLITPKG .Xr src.conf 5 From nobody Tue Dec 2 19:47:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLWWK5wbDz6J3FM for ; Tue, 02 Dec 2025 19:47: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLWWJ51qSz3tWJ for ; Tue, 02 Dec 2025 19:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764704829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3SwNpi19kLRf9NoAbmRYaGPOM8iYWPvcCPRioeAZA9c=; b=vFSyQH3aAnltP1JuNKN9AbrzANsEgposaw2Ynm5fVL+pyC4inNHbOVwMSHQ0fyPutgRBeA FQQQjM5wp2j+YwM6uRKbyGsGQUiLtzsL5ZhlqSq8R3ET3ImwP/34ZBTq0QU5LJPHLlQL5u KZSddB/A6AfstpXvxdcxyrDzNCoe9gEAXRZmavt+HxcLudur4CkGjloKuyvhRuG4wFXVVD YLOeWlxkE9iq3kSIqgQVgjiByRbNzs/PG7L46u6cGRrOpUuyJaEUML+y0FuOovqIeukixs W7B/8u3GWNu5tjN0/1+Cu0T1pRI15NvF8oswkkkSL7x6cZSHetRKiR99piX2XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764704829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3SwNpi19kLRf9NoAbmRYaGPOM8iYWPvcCPRioeAZA9c=; b=h2OwdSfKV5vESEB1bqm3dCyRlpUDE9MfVgWXhdwlAQjvLWxJhtDwTJX1+E9TwefAmBx4r2 eKgBfdNAjinN1pSNP563L+FJIwx1cZf9jwAD6GNRN/3qyQrK0hzO+GjhNfXR1B/wtvV0S5 LhA4KKWK3P7CQQV0z2qmK84E7G0FyPoMM7liMreUPf4nOA08qdJExpHSRznWAeA2sasqF8 +qmUlDkaPAX4Fpd12UuuECIuXhBDV5MVxh/AErtB9Nin6mfL01Y6KIVPBYeozx4NaPRujh FQ71IqUakq957uokHfSxYsiZhA8jSM5fvYf2mkAryC+EAmFiwkCNGu6IiT7wLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764704829; a=rsa-sha256; cv=none; b=tXAqwLkXCE8HAhQ5814HyyuzsE3Uj0qJEanYeu9pQ3Jk3Mlmb4R5O8PwV4C0JK3hx2eFQH YyIcpskVzbwKRv8H2El4NzXEMLpAFc6y021nF1wj5O+vycs53CqeP3gCWwrfDIf1I4WhpU UeKBsETj3ulQYF8FqTRBEba+dGaJnnZVh+0zAlDDgefnPWKawC+lu6lkoObMjVA7iN71nB +juzreL/coA49A3RkhYMIPVwrb/DE5E+sQPelWkD1JUjCRaI7F8UkZtXnoOoLrnzRYUCAz mxZh7TLVd7Q3dCp0+yOZADwWDLY4Yb6zONES0OJdMVDf8a6xlmaCI7tc+6LWXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLWWJ4LjXz1KF3 for ; Tue, 02 Dec 2025 19:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 269cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Dec 2025 19:47:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: polyduekes From: Alexander Ziaee Subject: git: df815450fbdb - main - release.7: PKGBASE is now the default List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df815450fbdb494c85ca0c53f43cf9cee59e7dd1 Auto-Submitted: auto-generated Date: Tue, 02 Dec 2025 19:47:08 +0000 Message-Id: <692f423c.269cf.2f666b1c@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=df815450fbdb494c85ca0c53f43cf9cee59e7dd1 commit df815450fbdb494c85ca0c53f43cf9cee59e7dd1 Author: polyduekes AuthorDate: 2025-12-02 13:53:43 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-02 19:45:31 +0000 release.7: PKGBASE is now the default Signed-off-by: polyduekes-git Reviewed by: cperciva, emaste, ziaee Closes: https://github.com/freebsd/freebsd-src/pull/1913 --- share/man/man7/release.7 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 2493a34721bc..3309b7edccc3 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -287,10 +287,9 @@ within the This is intended for use only when .Fa /usr/ports is expected to exist by alternative means. -.It Va PKGBASE -Include base system packages for use with -.Xr pkg 8 -on the install media, instead of legacy tarball distribution sets. +.It Va NOPKGBASE +Include legacy tarball distribution sets for use on the install media, +instead of base system packages. .It Va PKG_CMD A path to the .Xr pkg 8 From nobody Wed Dec 3 00:50:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLfDn6NN7z6JW4c for ; Wed, 03 Dec 2025 00:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLfDn5qsVz3fxf for ; Wed, 03 Dec 2025 00:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764723001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CmlZ/GOxEHCSADDzj/8zRObu+jzBzF4paGz1eGlLbi8=; b=GUNr1E4ZZlLnim98iNxBlIDxErdRA1ybKr03baEF6Gz5rBeVXwvzW0FBWXoCt/gHTgvVfB 31Z7ER1JStzwjaFIgP9P2jPCi/TWSAxkpT86ixS4voEgWJwQv/4ud8as2OBfMgVErl+pt6 /dXHZKF7PqxkHG5PHyfCJp2fgu2gK1QXnregp7rsAw/rxDzDnxa4yDx5UiOnk7iMkJu003 6KvL1dHt4q+iIdQeb9KpX/V9DHoARrKE/BIxOsKSHKxwZ/FKmybglLCxc1mNcPse6JHHTm iRQtOiUTtP8hu2s9r5vdfbbseajDGcfwuLbDJHff3UsS8tBYRJfzpASy1nefwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764723001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CmlZ/GOxEHCSADDzj/8zRObu+jzBzF4paGz1eGlLbi8=; b=bv91WVJej79d439OwLypo+nL2/oL71Nxn5thUT7AqYeGx4jsfrx5I8lk4SS1lU5KHe7LFQ f1GwmSOV+q1x3PvWRLIzYhE6YBBs5+Zu8vxg38tyMvEaH+OTVfZpnoH06WlzjMTsay/0ab dPDWLN9jF1qYBogfXNkjAA9NReMCaKwqDlQitPx32OfySEKgQZ1kvpHNEAmJWpb7RF29EZ mkIE12SFM4xQJQZroN6FcdcxzXb+WPAzDso8nArRG+bJdRpg0JiKYzVRRsMORiyGCi3wTh L+m2D4LGNpOToi+38yw9gv4gISE5fokM3A0GDs+5ZOw9ItwfMlprg9KzmcEfgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764723001; a=rsa-sha256; cv=none; b=RAQjnu8Bd1SJBwaRh1K2dW8g9SmLXlHqIkW+/f+uKg0vZvjsiKwitq6pp6aZ1KF5eej8cf rX0W2RB675ZrD1iMGLm2oQ16OivJDJPPrt5doL6WLgO4nFV/AuVkBRd+KuoodtbId2RZ95 NrNd489I5vr7G5qebRt2Te8HBBdcPa7fxBNs+VlT586tmadELs+AJIu54cEX+p62JzZkht so+9xNW3qqbmlCbIl2YzsGxzgItWY4+Z2S7kITFPUn/qS7rOl5p3QeA8YBWT/d0rn6RYL+ W63iRKh998+Hw41fN4FCe1eejqJrSYbUidc7344PLq7KzSe73E/uKqABN7lJ7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLfDn56YSz14P for ; Wed, 03 Dec 2025 00:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24751 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 00:50:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 45d8bfdcba37 - main - LinuxKPI: page.c: remove a spurious character from a comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45d8bfdcba37996993748f4667646f5dc9f54506 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 00:50:01 +0000 Message-Id: <692f8939.24751.7ebb5e8f@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=45d8bfdcba37996993748f4667646f5dc9f54506 commit 45d8bfdcba37996993748f4667646f5dc9f54506 Author: Bjoern A. Zeeb AuthorDate: 2025-12-03 00:45:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-03 00:49:45 +0000 LinuxKPI: page.c: remove a spurious character from a comment No functional changes. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 9cc981b2ba43..2b2827579cba 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -175,7 +175,7 @@ linux_free_pages(struct page *page, unsigned int order) * contexts. * * Some pages are allocated by `linux_alloc_pages()` - * above, but not all of them are. For instance in the + * above, but not all of them are. For instance in the * DRM drivers, some pages come from * `shmem_read_mapping_page_gfp()`. * From nobody Wed Dec 3 01:38:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLgJH14GNz6JZkD for ; Wed, 03 Dec 2025 01:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLgJG4kMrz3lmQ for ; Wed, 03 Dec 2025 01:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764725886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HFh7ycmfVrJdPW8AZyjk8Z0xgQr/DjlIEgnjkN+Rv4Q=; b=QTCg+xvJxzaZlExARxOQ0kVV+sAz/clrOr3nIITdSdjCIR2sx8ZoZ9jqWt088395TMU98A DCL6JFvrkuGQIxjBbtm/9NWtINbo9y45ShkqJYgrwG7wnp2sD7lkDd9J7rBuhnGQ3ND5JB LAW7W/+XHhmOBmTtkwQTR1v+2/tgZp3TfVUzFdYs3uYK1GiJqg0FbpYekKkymaZQBGNaKI n6MnuZtrlOo9fMIw1YZZAxj/X7q7gxT+Re5FH61p8hPPNIpbaVV7aSpj0aHX9334AM5evB IdIST4DM7RCcXvRGbjHi5dLjbO0pymcWShFAeZmEspQQ2JBkKqFiiGztg7aayQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764725886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HFh7ycmfVrJdPW8AZyjk8Z0xgQr/DjlIEgnjkN+Rv4Q=; b=GpwvU7/6o3mcLDDE9R1749rQ3QxFAVBFTIRrvZSFneSd29V1lelBVB/2XkplKYHiQso08c NR3NHsPrxazS8lN9+6PcGdWTLzzt6e/X5DxIx5EUd/Nq9wvi9uYqYJa9VOdclzhO+QorZj bZ010d1RQcIqxGLSEujQZux6UvTUkEaM4VszbI0CeC7gGkeIG6/OukkJvMPJdzWQGPd24E bYrEBEXRRdd+zX1EHHU4Osfwyjp5QSm6dhbTg4KRcnk6paU08x41D581R/5Ccfck6qt/ue ezOrWPntBb6j2r7AtS4lvwwauWO6bxEYJKWhoh4PHRLNMntXGap158QJ4ElV0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764725886; a=rsa-sha256; cv=none; b=e6ORjMREHvl59CVg51OqEed0ldpXoWQ+tUBkVl3suBD/JMTNfxko2ooPy/Xm+bNXkuzrU6 ix+ehdAUw3pn04R6qGVxu6DXSlEl483MD2h5j+mXlg4XB+m6T1TjaEbrQV1NzF4R2c0UwW xpNIPPSvVOXFSrZ/iij9zrh9ymfVOrR0LegGtZM6MuavpijBApqkMO7la4a70XJrCZ768r zYMisH1oBDdL1y5KOJReRfscX9i6cuM/COu57BzkCKBDUjpotGSWkAVbMNEpS3gBNZXO2g CWAkQlBfcqY0VtGZSoJNG/rSKmSCVpiZJqbmtZS7/0zmTz0mJFj8jPuEDpabeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLgJG3CHMz2C9 for ; Wed, 03 Dec 2025 01:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2a72f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 01:38:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 86bfe5b4d5a7 - main - LinuxKPI: 802.11: make airtime fairness an IMPROVE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86bfe5b4d5a7b90d3746059dd1f87cdd5a0bf90c Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 01:38:06 +0000 Message-Id: <692f947e.2a72f.29a59b0c@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=86bfe5b4d5a7b90d3746059dd1f87cdd5a0bf90c commit 86bfe5b4d5a7b90d3746059dd1f87cdd5a0bf90c Author: Bjoern A. Zeeb AuthorDate: 2025-12-03 00:55:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-03 00:55:36 +0000 LinuxKPI: 802.11: make airtime fairness an IMPROVE We are ways away from implementing "airtime fairness" in LinuxKPI (or rather net80211). For now make it an 'improve' rather than a 'todo' to get the logging away. Everything will work without it. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 0eda07a8235c..ea9797befe58 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -2291,7 +2291,7 @@ static __inline void ieee80211_sta_register_airtime(struct ieee80211_sta *sta, uint8_t tid, uint32_t duration, int x) { - TODO(); + IMPROVE("NL80211_EXT_FEATURE_AIRTIME_FAIRNESS and TX queus"); } static __inline void From nobody Wed Dec 3 01:38:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLgJH61crz6JZ5P for ; Wed, 03 Dec 2025 01:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLgJH3sG1z3ltf for ; Wed, 03 Dec 2025 01:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764725887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/p5l2BI7H9edBfxHR7dWLSbAiE9U5eTpoKeGH/ciDuU=; b=MOI3IVyq8Lgv5/Oc3YwqUkO7xRbXyyhNq0brmmh1jOVAUs+bzXMnb8+6qHLvGjFLDxtbhr e6NJWjbQoN0VZf1IXRXQrt75vI1y7z5X8IcoBwaTSui89gfPxXfbaq4lwXzS9TgxKfrJvE B8QPC1r9opq1XwfxN3WdTfq5BXzoMWKnQ0BhNdWAQls/JhjcJ7yp2WI/KIdWEdLSdKfuo3 xROCdcQ8n6Z4H/UDN6pYFRsgb9IDO2JHQ5GnOQh7NJHU9P/XMaIlSPWiSNzBfFs9PrLlbj eqPiibCrgEvzPxWEg3iglvrkSSxkn9tpuRTeCRAkZfuQExw7LPFhAbe+QrD0vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764725887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/p5l2BI7H9edBfxHR7dWLSbAiE9U5eTpoKeGH/ciDuU=; b=cXJCT3TMTj7mo5BDtGDT3UdWKUffNKDdunOJ2tJobH8I694bsieXsdB9H1NhWXLEYoHjaH +ZWf+ezbd88RgExuAoI3kQ3ExqbQV5jFxDZ001zVRU8EdMMC+nH7epEpcd6zvXjKdqZUCb qlWNPEgeF9mRPS4EpuFTNZ/veo5slGl1rHS2MW0MHJR6wwVNnIvZ9GtN+oSU+7fMrx67rT CQ63TQOdUmMaNgxsVyFUKhx7bP+EetqGiZCAuE3pAcwPvUoJRrrFF8i9BT3d/7g5if9Gat +poHtooxpAVqOryvdTC+X5o0IzShkRwo+BeMmq640dAtEfzPxT4MOLoLMliPVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764725887; a=rsa-sha256; cv=none; b=cDmReQOdN9VbW4hZm1U9vw3/IBScbo/aWJyziXk8dMZlkqRsG0Z54kvcHtUsdHFzgr4i4C nso+o32i0i704wrNbjU75S7KcpVDvvfwIfIWi+XItm6a7/iY1ZmpZOFv/f6eUbFSyl+mHS 23jOC6wNID06pwcHF/3oXX9EqSJDZ9bGyzEeGHOmiuZGyu0uCIJfIZbvPRFiO2iV7EXYKr liUmQFDeLgERyfjUFmAqI+gztZylOXY8GSrl0ggn0gaLaFJuiaYIyzTdJZ55eouRspMqpx w5j/bEWQPeI8mLahTcYxJ7nB6ZxBhW9MpcqCtlgK2EynoczcRvOKUUESxvjizw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLgJH3S7hz24g for ; Wed, 03 Dec 2025 01:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 29358 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 01:38:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: fc9666d0fc0c - main - LinuxKPI: device: add a pr_debug("TODO") call to device_release_driver() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc9666d0fc0c2541e44bfbcaa5bb1b670395687c Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 01:38:07 +0000 Message-Id: <692f947f.29358.265cd01a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fc9666d0fc0c2541e44bfbcaa5bb1b670395687c commit fc9666d0fc0c2541e44bfbcaa5bb1b670395687c Author: Bjoern A. Zeeb AuthorDate: 2025-12-03 01:09:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-03 01:09:24 +0000 LinuxKPI: device: add a pr_debug("TODO") call to device_release_driver() The logic in device_release_driver() got disabled in 93b14194acaf2 and since left alone. Add a pr_debug() call so we have a chance to notice if that code is actually still in need to be fixed and re-enabled. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/device.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index c291133e2e0b..8834f1799e61 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -557,6 +557,7 @@ static inline void device_release_driver(struct device *dev) { + pr_debug("%s: TODO\n", __func__); #if 0 /* This leads to panics. Disable temporarily. Keep to rework. */ From nobody Wed Dec 3 04:06:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLkbj4DlZz6JmMS for ; Wed, 03 Dec 2025 04:06: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLkbj0qzzz44KW for ; Wed, 03 Dec 2025 04:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764734801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vjuLkVUlrZLh795+AtgKXHT8nzrcFQr0XGMI+lbsxgQ=; b=EdpSbaYHrX6UqROXuIvXaG7PkCP4VATpD6Q04SUZ28mqbaqAHmqDRckbHaMiVTEhXgh5CE Q0QI1m35CE0Ko9kOXb5RlhZoP44K/RYLZK8/8n5qgAXLqHcN+3GnrXpib1KAOsw8321PXj 1ZJuHxBf+dKS3uHteKRpTQOjyXgR5ClTAO7Eg5mzdYbqPvYxYY1jXIjxpyCGgJ1AGYM9Xp ZraMXJliFBPpZnXwMSFPmuHZcevyHyf8Z6+qEsC9bgNoMYfr5Z9h/dv+pVLDu0gUBMNuSl SklmY0RoB51I7n7jFUKa9ExQcdyGCBQjaX6XcpMaE/G/eTHMgKteeIEg8APsXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764734801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vjuLkVUlrZLh795+AtgKXHT8nzrcFQr0XGMI+lbsxgQ=; b=se66v4B1cupa9iH9NJ7DKCI0uIVynd8pZC6M9ciXcEXRSLlHyLejRK/wNNQcNW+97nh18z IggU6o0JD6zhTvxxNJVwWTzYGsWHPhkUv0AXJETbtlLCvTFDCFafUf8MPMdgfFVS21D/GS MC0ZwN6NQcFkbeZjh8ybWZCR6LUJcaI8LUnYsgWB7wufG6m2TDL6x5Q0oGWI2DRWETN2jy YUIrrKqGLcx9sM3sSqXAO7agVZ1gvamcbt/EekJ5c3AWebZmHaPodENJIqBm/YDBWnRqEo kH9k8QnCKpORO7qDT5qAFpmWNdfA+/CFHIY1hwUpb0oN3hxVp8HsazyTHvmX3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764734801; a=rsa-sha256; cv=none; b=QubyyMvMFFesVCUrnMnb1tWpOGmM+TJjJ92x2nXLgfSiTydxSiN6jxVZ4uJ0Q/qA2x3jiG xGt6F3XmjXar3iX7nkbzZqhePhPT+NXd6gjg4AQ0JKXXrEcB7TmIwJG2FaQ6z7x/qqWVqZ NZ/JFckDjWiABrWV1uS85/soIQTnwk4KDZQd3LGDBkjYJIatuAuPu2RR4+DzUqeCE63TVC iwGh8x7F4mjqR/s50YIyz+51+YztR2mC1c3FO87E0oV8Kvx1I0jsfOoJxyrfFbQULc12HR 65aEhI0YdTs4Hwpn9tfvIxz8Xdn5Cs2m1H4MivQQoZSvE1CWsC1bwmnCdSO9VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLkbj08kVz5sM for ; Wed, 03 Dec 2025 04:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a00b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 04:06:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 3a99f31fdb6c - main - ufshci: Support suspend/resume List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a99f31fdb6c66434f77d83ca5166aae4ad2d22c Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 04:06:41 +0000 Message-Id: <692fb751.3a00b.5af458cc@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=3a99f31fdb6c66434f77d83ca5166aae4ad2d22c commit 3a99f31fdb6c66434f77d83ca5166aae4ad2d22c Author: Jaeyoon Choi AuthorDate: 2025-12-03 04:05:36 +0000 Commit: Jaeyoon Choi CommitDate: 2025-12-03 04:05:36 +0000 ufshci: Support suspend/resume Handle system power events and issue START STOP UNIT (SSU) to the UFS Device WLUN (0x50). Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D54002 --- sys/dev/ufshci/ufshci_ctrlr.c | 50 +++++++++++++++++++++++++++++++++++++++ sys/dev/ufshci/ufshci_dev.c | 19 +++++++++++++++ sys/dev/ufshci/ufshci_pci.c | 23 ++++++++++++++++-- sys/dev/ufshci/ufshci_private.h | 35 ++++++++++++++++++++++++++- sys/dev/ufshci/ufshci_req_queue.c | 3 ++- sys/dev/ufshci/ufshci_sim.c | 7 +++++- sys/dev/ufshci/ufshci_sysctl.c | 3 +++ 7 files changed, 135 insertions(+), 5 deletions(-) diff --git a/sys/dev/ufshci/ufshci_ctrlr.c b/sys/dev/ufshci/ufshci_ctrlr.c index 1ffa99255088..f0cb08b34823 100644 --- a/sys/dev/ufshci/ufshci_ctrlr.c +++ b/sys/dev/ufshci/ufshci_ctrlr.c @@ -610,3 +610,53 @@ ufshci_reg_dump(struct ufshci_controller *ctrlr) ufshci_printf(ctrlr, "========================================\n"); } + +int +ufshci_ctrlr_suspend(struct ufshci_controller *ctrlr, enum power_stype stype) +{ + int error; + + if (!ctrlr->ufs_dev.power_mode_supported) + return (0); + + /* TODO: Need to flush the request queue */ + + if (ctrlr->ufs_device_wlun_periph) { + ctrlr->ufs_dev.power_mode = power_map[stype].dev_pwr; + error = ufshci_sim_send_ssu(ctrlr, /*start*/ false, + power_map[stype].ssu_pc, /*immed*/ false); + if (error) { + ufshci_printf(ctrlr, + "Failed to send SSU in suspend handler\n"); + return (error); + } + } + + /* TODO: Change the link state to Hibernate if necessary. */ + + return (0); +} + +int +ufshci_ctrlr_resume(struct ufshci_controller *ctrlr, enum power_stype stype) +{ + int error; + + if (!ctrlr->ufs_dev.power_mode_supported) + return (0); + + /* TODO: Change the link state to Active if necessary. */ + + if (ctrlr->ufs_device_wlun_periph) { + ctrlr->ufs_dev.power_mode = power_map[stype].dev_pwr; + error = ufshci_sim_send_ssu(ctrlr, /*start*/ false, + power_map[stype].ssu_pc, /*immed*/ false); + if (error) { + ufshci_printf(ctrlr, + "Failed to send SSU in resume handler\n"); + return (error); + } + } + + return (0); +} diff --git a/sys/dev/ufshci/ufshci_dev.c b/sys/dev/ufshci/ufshci_dev.c index 9696e8ea8091..136823523fd3 100644 --- a/sys/dev/ufshci/ufshci_dev.c +++ b/sys/dev/ufshci/ufshci_dev.c @@ -469,6 +469,8 @@ ufshci_dev_init_ufs_power_mode(struct ufshci_controller *ctrlr) } ctrlr->ufs_dev.power_mode_supported = true; + ctrlr->ufs_dev.power_mode = UFSHCI_DEV_PWR_ACTIVE; + return (0); } @@ -786,3 +788,20 @@ out: ufshci_dev_disable_write_booster(ctrlr); return (error); } + +int +ufshci_dev_get_current_power_mode(struct ufshci_controller *ctrlr, + uint8_t *power_mode) +{ + uint64_t value; + int err; + + err = ufshci_dev_read_attribute(ctrlr, UFSHCI_ATTR_B_CURRENT_POWER_MODE, + /*index*/ 0, /*selector*/ 0, &value); + if (err) + return (err); + + *power_mode = (uint8_t)value; + + return (0); +} diff --git a/sys/dev/ufshci/ufshci_pci.c b/sys/dev/ufshci/ufshci_pci.c index 7f78e462db72..5fce14997784 100644 --- a/sys/dev/ufshci/ufshci_pci.c +++ b/sys/dev/ufshci/ufshci_pci.c @@ -23,6 +23,8 @@ static int ufshci_pci_probe(device_t); static int ufshci_pci_attach(device_t); static int ufshci_pci_detach(device_t); +static int ufshci_pci_suspend(device_t); +static int ufshci_pci_resume(device_t); static int ufshci_pci_setup_interrupts(struct ufshci_controller *ctrlr); @@ -31,8 +33,8 @@ static device_method_t ufshci_pci_methods[] = { DEVMETHOD(device_probe, ufshci_pci_probe), DEVMETHOD(device_attach, ufshci_pci_attach), DEVMETHOD(device_detach, ufshci_pci_detach), - /* TODO: Implement Suspend, Resume */ - { 0, 0 } + DEVMETHOD(device_suspend, ufshci_pci_suspend), + DEVMETHOD(device_resume, ufshci_pci_resume), { 0, 0 } }; static driver_t ufshci_pci_driver = { @@ -261,3 +263,20 @@ msi: intx: return (ufshci_pci_setup_shared(ctrlr, ctrlr->msi_count > 0 ? 1 : 0)); } + +static int +ufshci_pci_suspend(device_t dev) +{ + struct ufshci_controller *ctrlr = device_get_softc(dev); + + /* Currently, PCI-based ufshci only supports POWER_STYPE_STANDBY */ + return (ufshci_ctrlr_suspend(ctrlr, POWER_STYPE_STANDBY)); +} + +static int +ufshci_pci_resume(device_t dev) +{ + struct ufshci_controller *ctrlr = device_get_softc(dev); + + return (ufshci_ctrlr_resume(ctrlr, POWER_STYPE_AWAKE)); +} diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index 22e77c9b9326..fa5caf87196c 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -26,12 +26,14 @@ #include #include #include +#include #include #include #include #include +#include #include "ufshci.h" @@ -233,6 +235,30 @@ struct ufshci_req_queue { bus_dmamap_t ucdmem_map; }; +enum ufshci_dev_pwr { + UFSHCI_DEV_PWR_ACTIVE = 0, + UFSHCI_DEV_PWR_SLEEP, + UFSHCI_DEV_PWR_POWERDOWN, + UFSHCI_DEV_PWR_DEEPSLEEP, + UFSHCI_DEV_PWR_COUNT, +}; + +struct ufshci_power_entry { + enum ufshci_dev_pwr dev_pwr; + uint8_t ssu_pc; /* SSU Power Condition */ +}; + +/* SSU Power Condition 0x40 is defined in the UFS specification */ +static const struct ufshci_power_entry power_map[POWER_STYPE_COUNT] = { + [POWER_STYPE_AWAKE] = { UFSHCI_DEV_PWR_ACTIVE, SSS_PC_ACTIVE }, + [POWER_STYPE_STANDBY] = { UFSHCI_DEV_PWR_SLEEP, SSS_PC_IDLE }, + [POWER_STYPE_SUSPEND_TO_MEM] = { UFSHCI_DEV_PWR_POWERDOWN, + SSS_PC_STANDBY }, + [POWER_STYPE_SUSPEND_TO_IDLE] = { UFSHCI_DEV_PWR_SLEEP, SSS_PC_IDLE }, + [POWER_STYPE_HIBERNATE] = { UFSHCI_DEV_PWR_DEEPSLEEP, 0x40 }, + [POWER_STYPE_POWEROFF] = { UFSHCI_DEV_PWR_POWERDOWN, SSS_PC_STANDBY }, +}; + struct ufshci_device { uint32_t max_lun_count; @@ -252,6 +278,7 @@ struct ufshci_device { /* Power mode */ bool power_mode_supported; + enum ufshci_dev_pwr power_mode; }; /* @@ -386,12 +413,16 @@ void ufshci_sim_detach(struct ufshci_controller *ctrlr); struct cam_periph *ufshci_sim_find_periph(struct ufshci_controller *ctrlr, uint8_t wlun); int ufshci_sim_send_ssu(struct ufshci_controller *ctrlr, bool start, - int pwr_cond, bool immed); + uint8_t pwr_cond, bool immed); /* Controller */ int ufshci_ctrlr_construct(struct ufshci_controller *ctrlr, device_t dev); void ufshci_ctrlr_destruct(struct ufshci_controller *ctrlr, device_t dev); void ufshci_ctrlr_reset(struct ufshci_controller *ctrlr); +int ufshci_ctrlr_suspend(struct ufshci_controller *ctrlr, + enum power_stype stype); +int ufshci_ctrlr_resume(struct ufshci_controller *ctrlr, + enum power_stype stype); /* ctrlr defined as void * to allow use with config_intrhook. */ void ufshci_ctrlr_start_config_hook(void *arg); void ufshci_ctrlr_poll(struct ufshci_controller *ctrlr); @@ -415,6 +446,8 @@ int ufshci_dev_init_uic_power_mode(struct ufshci_controller *ctrlr); int ufshci_dev_init_ufs_power_mode(struct ufshci_controller *ctrlr); int ufshci_dev_get_descriptor(struct ufshci_controller *ctrlr); int ufshci_dev_config_write_booster(struct ufshci_controller *ctrlr); +int ufshci_dev_get_current_power_mode(struct ufshci_controller *ctrlr, + uint8_t *power_mode); /* Controller Command */ void ufshci_ctrlr_cmd_send_task_mgmt_request(struct ufshci_controller *ctrlr, diff --git a/sys/dev/ufshci/ufshci_req_queue.c b/sys/dev/ufshci/ufshci_req_queue.c index 7aa164d00bec..df7e4b159278 100644 --- a/sys/dev/ufshci/ufshci_req_queue.c +++ b/sys/dev/ufshci/ufshci_req_queue.c @@ -147,7 +147,8 @@ ufshci_req_queue_response_is_error(struct ufshci_req_queue *req_queue, /* Check response UPIU header */ if (response->header.response != UFSHCI_RESPONSE_CODE_TARGET_SUCCESS) { ufshci_printf(req_queue->ctrlr, - "Invalid response code = 0x%x\n", + "Function(0x%x) Invalid response code = 0x%x\n", + response->header.ext_iid_or_function, response->header.response); is_error = true; } diff --git a/sys/dev/ufshci/ufshci_sim.c b/sys/dev/ufshci/ufshci_sim.c index 0cd691de47e2..1589e7475ad4 100644 --- a/sys/dev/ufshci/ufshci_sim.c +++ b/sys/dev/ufshci/ufshci_sim.c @@ -46,6 +46,11 @@ ufshci_sim_scsiio_done(void *ccb_arg, const struct ufshci_completion *cpl, ccb->ccb_h.status &= ~CAM_SIM_QUEUED; if (error) { + printf("ufshci: SCSI command completion error, Status(0x%x)" + " Key(0x%x), ASC(0x%x), ASCQ(0x%x)\n", + cpl->response_upiu.cmd_response_upiu.header + .ext_iid_or_status, + sense_data[2], sense_data[12], sense_data[13]); ccb->ccb_h.status = CAM_REQ_CMP_ERR; xpt_done(ccb); } else { @@ -455,7 +460,7 @@ ufshci_sim_find_periph(struct ufshci_controller *ctrlr, uint8_t wlun) /* This function is called during suspend/resume. */ int ufshci_sim_send_ssu(struct ufshci_controller *ctrlr, bool start, - int power_condition, bool immed) + uint8_t power_condition, bool immed) { struct cam_periph *periph = ctrlr->ufs_device_wlun_periph; union ccb *ccb; diff --git a/sys/dev/ufshci/ufshci_sysctl.c b/sys/dev/ufshci/ufshci_sysctl.c index 3ec4ea935464..30b0ccaeed13 100644 --- a/sys/dev/ufshci/ufshci_sysctl.c +++ b/sys/dev/ufshci/ufshci_sysctl.c @@ -201,6 +201,9 @@ ufshci_sysctl_initialize_ctrlr(struct ufshci_controller *ctrlr) CTLFLAG_RD, &dev->power_mode_supported, 0, "Device power mode support"); + SYSCTL_ADD_UINT(ctrlr_ctx, ctrlr_list, OID_AUTO, "power_mode", + CTLFLAG_RD, &dev->power_mode, 0, "Current device power mode"); + SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, "timeout_period", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, &ctrlr->timeout_period, 0, ufshci_sysctl_timeout_period, "IU", From nobody Wed Dec 3 04:06:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLkbl4msLz6Jm9T for ; Wed, 03 Dec 2025 04:06: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLkbl24HWz44Gk for ; Wed, 03 Dec 2025 04:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764734803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6Yj7dX1A7heBGH3oKqYK05RLsIOumvjNoPvpHWw03o=; b=r8bFXwlGFSF3UhSQMfykg/4hD40eR65JNR3Lm+AFvpOvY7iBGbfoSNO2RQaHRqteYsohs2 5IVj0WDZn7TjrxpLiEeBVyUR94B1eHp9dsxvd6GKyY/02zJwDnkOsHycqSbOo6t0wUF+yQ fRvmn1py1Oq3oUvDA/zmZx7ftkPd2Q0z8oPn3xlDCIQHOsYprsVCUiLJZWq+ZWhD8eMgMh in5SmqVtZBR1elCnWH14dWmmaogV/z+yYRphoJfc6iytXVhcWAG8cJb+9a4kH3ytctMUZR D9diN6jr3Y89VfWQfXFTjzSjE+epR7jsaYwwjM4rdNLp9OhzZp9AVLDdLIMw5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764734803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6Yj7dX1A7heBGH3oKqYK05RLsIOumvjNoPvpHWw03o=; b=dFSuVbOke6KrFvA2Q6LyMRjs0AL6EHQyakSKU344J+aoQTpjdEmenqUzjUQEL/PXRxGEeL +m3NCfZIb2U9GgNaDHRc9+2xG7fzFjVXk5vAbJaeAEFQt3oeS63p30N5QHt/KBjZjGN1KW /FfO3ns9H1tPuKhmgbm9s2+pDvsYrgc2iN/ljYVRUpcu8GxZniCYZxHSMTPu9pr37ZszSI L5vOTOKsE8oDoE1MknU+JMBLRpx+ieGBlB6DzSZ/8hkVuh+jFwbw97iiow5gYR4teDokDb UwJPmyaKzBwq2TbkgBcsI8H5UH3Te6pupJfGTV0fU4QDauXuxnSlTEn3zJldMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764734803; a=rsa-sha256; cv=none; b=C4HB2rfASA/+F9Rujup9xJhzS1gdOGA84BIAdfFbNQBu80C7AKjz7QDQa+UG8GPYly3osL A7AWZAH1RT6TZj5C2WPBHzM4/CJqZzTAmLz9jKuzGR2+/yP0h7yNZRZ5fCn6CE6mRE/m8R 4Tjo/aVB0e5rFNK2H4JCEHknTghl1FH0KIz6sl/zi91Rb0+59XSYGumBkAX63rgVG9n3cI nsViHywqTOAT1W6vtvjb2HY5hMq3G/EKyVhepMVlInjMVqj8eK34K6Dit8ytuChq2flJlq kg+2GgW0/WQjNzOMZDBVlFgAJrEUzzFOBjxNa3v809/BCyMjBx5jZvYcaVn3sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLkbl1ZB3z6DX for ; Wed, 03 Dec 2025 04:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 395f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 04:06:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: db8b06468bae - main - ufshci: Support UIC Auto Hibernation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db8b06468baefb9d9b5db5f91084d85071bfb5cb Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 04:06:43 +0000 Message-Id: <692fb753.395f5.57220ef9@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=db8b06468baefb9d9b5db5f91084d85071bfb5cb commit db8b06468baefb9d9b5db5f91084d85071bfb5cb Author: Jaeyoon Choi AuthorDate: 2025-12-03 04:06:01 +0000 Commit: Jaeyoon Choi CommitDate: 2025-12-03 04:06:01 +0000 ufshci: Support UIC Auto Hibernation Automatically transition the UniPro link to Hibernate when it is idle for the duration configured by the Auto-Hibernate Idle Timer (AHIT). This reduces link power while the device is inactive. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D54004 --- sys/dev/ufshci/ufshci_ctrlr.c | 4 ++++ sys/dev/ufshci/ufshci_dev.c | 27 +++++++++++++++++++++++++++ sys/dev/ufshci/ufshci_pci.c | 3 ++- sys/dev/ufshci/ufshci_private.h | 9 +++++++++ sys/dev/ufshci/ufshci_sysctl.c | 28 ++++++++++++++++++++++++++++ sys/dev/ufshci/ufshci_uic_cmd.c | 5 +++-- 6 files changed, 73 insertions(+), 3 deletions(-) diff --git a/sys/dev/ufshci/ufshci_ctrlr.c b/sys/dev/ufshci/ufshci_ctrlr.c index 494313df95de..ce0da4cab907 100644 --- a/sys/dev/ufshci/ufshci_ctrlr.c +++ b/sys/dev/ufshci/ufshci_ctrlr.c @@ -92,6 +92,8 @@ ufshci_ctrlr_start(struct ufshci_controller *ctrlr, bool resetting) return; } + ufshci_dev_init_auto_hibernate(ctrlr); + /* TODO: Configure Write Protect */ /* TODO: Configure Background Operations */ @@ -674,5 +676,7 @@ ufshci_ctrlr_resume(struct ufshci_controller *ctrlr, enum power_stype stype) } } + ufshci_dev_enable_auto_hibernate(ctrlr); + return (0); } diff --git a/sys/dev/ufshci/ufshci_dev.c b/sys/dev/ufshci/ufshci_dev.c index c4a5bda9c79a..38c6de9731a4 100644 --- a/sys/dev/ufshci/ufshci_dev.c +++ b/sys/dev/ufshci/ufshci_dev.c @@ -449,6 +449,33 @@ ufshci_dev_init_uic_power_mode(struct ufshci_controller *ctrlr) return (0); } +void +ufshci_dev_enable_auto_hibernate(struct ufshci_controller *ctrlr) +{ + if (!ctrlr->ufs_dev.auto_hibernation_supported) + return; + + ufshci_mmio_write_4(ctrlr, ahit, ctrlr->ufs_dev.ahit); +} + +void +ufshci_dev_init_auto_hibernate(struct ufshci_controller *ctrlr) +{ + ctrlr->ufs_dev.auto_hibernation_supported = + UFSHCIV(UFSHCI_CAP_REG_AUTOH8, ctrlr->cap) && + !(ctrlr->quirks & UFSHCI_QUIRK_BROKEN_AUTO_HIBERNATE); + + if (!ctrlr->ufs_dev.auto_hibernation_supported) + return; + + /* The default value for auto hibernation is 150 ms */ + ctrlr->ufs_dev.ahit = 0; + ctrlr->ufs_dev.ahit |= UFSHCIF(UFSHCI_AHIT_REG_AH8ITV, 150); + ctrlr->ufs_dev.ahit |= UFSHCIF(UFSHCI_AHIT_REG_TS, 3); + + ufshci_dev_enable_auto_hibernate(ctrlr); +} + void ufshci_dev_init_uic_link_state(struct ufshci_controller *ctrlr) { diff --git a/sys/dev/ufshci/ufshci_pci.c b/sys/dev/ufshci/ufshci_pci.c index 5fce14997784..b2a958f1cd1a 100644 --- a/sys/dev/ufshci/ufshci_pci.c +++ b/sys/dev/ufshci/ufshci_pci.c @@ -58,7 +58,8 @@ static struct _pcsid { UFSHCI_REF_CLK_19_2MHz, UFSHCI_QUIRK_LONG_PEER_PA_TACTIVATE | UFSHCI_QUIRK_WAIT_AFTER_POWER_MODE_CHANGE | - UFSHCI_QUIRK_CHANGE_LANE_AND_GEAR_SEPARATELY }, + UFSHCI_QUIRK_CHANGE_LANE_AND_GEAR_SEPARATELY | + UFSHCI_QUIRK_BROKEN_AUTO_HIBERNATE }, { 0x54ff8086, "Intel UFS Host Controller", UFSHCI_REF_CLK_19_2MHz }, { 0x00000000, NULL } }; diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index 8a49c2a9bc2b..bcb2bcef0230 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -293,6 +293,10 @@ struct ufshci_device { bool power_mode_supported; enum ufshci_dev_pwr power_mode; enum ufshci_uic_link_state link_state; + + /* Auto Hibernation */ + bool auto_hibernation_supported; + uint32_t ahit; }; /* @@ -314,6 +318,9 @@ struct ufshci_controller { 16 /* QEMU does not support Task Management Request */ #define UFSHCI_QUIRK_SKIP_WELL_KNOWN_LUNS \ 32 /* QEMU does not support Well known logical units*/ +#define UFSHCI_QUIRK_BROKEN_AUTO_HIBERNATE \ + 64 /* Some controllers have the Auto hibernate feature enabled but it \ + does not work. */ uint32_t ref_clk; @@ -457,6 +464,8 @@ int ufshci_dev_init(struct ufshci_controller *ctrlr); int ufshci_dev_reset(struct ufshci_controller *ctrlr); int ufshci_dev_init_reference_clock(struct ufshci_controller *ctrlr); int ufshci_dev_init_unipro(struct ufshci_controller *ctrlr); +void ufshci_dev_enable_auto_hibernate(struct ufshci_controller *ctrlr); +void ufshci_dev_init_auto_hibernate(struct ufshci_controller *ctrlr); int ufshci_dev_init_uic_power_mode(struct ufshci_controller *ctrlr); void ufshci_dev_init_uic_link_state(struct ufshci_controller *ctrlr); int ufshci_dev_init_ufs_power_mode(struct ufshci_controller *ctrlr); diff --git a/sys/dev/ufshci/ufshci_sysctl.c b/sys/dev/ufshci/ufshci_sysctl.c index 30b0ccaeed13..495f087f3c50 100644 --- a/sys/dev/ufshci/ufshci_sysctl.c +++ b/sys/dev/ufshci/ufshci_sysctl.c @@ -11,6 +11,7 @@ #include #include "ufshci_private.h" +#include "ufshci_reg.h" static int ufshci_sysctl_timeout_period(SYSCTL_HANDLER_ARGS) @@ -106,6 +107,22 @@ ufshci_sysctl_num_failures(SYSCTL_HANDLER_ARGS) return (sysctl_handle_64(oidp, &num_failures, 0, req)); } +static int +ufshci_sysctl_ahit(SYSCTL_HANDLER_ARGS) +{ + struct ufshci_controller *ctrlr = arg1; + int64_t scale, timer; + const int64_t scale_factor = 10; + + scale = UFSHCIV(UFSHCI_AHIT_REG_TS, ctrlr->ufs_dev.ahit); + timer = UFSHCIV(UFSHCI_AHIT_REG_AH8ITV, ctrlr->ufs_dev.ahit); + + while (scale--) + timer *= scale_factor; + + return (sysctl_handle_64(oidp, &timer, 0, req)); +} + static void ufshci_sysctl_initialize_queue(struct ufshci_hw_queue *hwq, struct sysctl_ctx_list *ctrlr_ctx, struct sysctl_oid *que_tree) @@ -201,6 +218,17 @@ ufshci_sysctl_initialize_ctrlr(struct ufshci_controller *ctrlr) CTLFLAG_RD, &dev->power_mode_supported, 0, "Device power mode support"); + SYSCTL_ADD_BOOL(ctrlr_ctx, ctrlr_list, OID_AUTO, + "auto_hibernation_supported", CTLFLAG_RD, + &dev->auto_hibernation_supported, 0, + "Device auto hibernation support"); + + SYSCTL_ADD_PROC(ctrlr_ctx, ctrlr_list, OID_AUTO, + "auto_hibernate_idle_timer_value", + CTLTYPE_S64 | CTLFLAG_RD | CTLFLAG_MPSAFE, ctrlr, 0, + ufshci_sysctl_ahit, "IU", + "Auto-Hibernate Idle Timer Value (in microseconds)"); + SYSCTL_ADD_UINT(ctrlr_ctx, ctrlr_list, OID_AUTO, "power_mode", CTLFLAG_RD, &dev->power_mode, 0, "Current device power mode"); diff --git a/sys/dev/ufshci/ufshci_uic_cmd.c b/sys/dev/ufshci/ufshci_uic_cmd.c index 29c143cec52c..c6e6afe3f688 100644 --- a/sys/dev/ufshci/ufshci_uic_cmd.c +++ b/sys/dev/ufshci/ufshci_uic_cmd.c @@ -196,8 +196,9 @@ ufshci_uic_send_cmd(struct ufshci_controller *ctrlr, config_result_code = ufshci_mmio_read_4(ctrlr, ucmdarg2); if (config_result_code) { ufshci_printf(ctrlr, - "Failed to send UIC command. (config result code = 0x%x)\n", - config_result_code); + "Failed to send UIC command (Opcode: 0x%x" + ", config result code = 0x%x)\n", + uic_cmd->opcode, config_result_code); } if (return_value != NULL) From nobody Wed Dec 3 04:06:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLkbm4lwYz6Jm3w for ; Wed, 03 Dec 2025 04:06: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLkbm2nD7z44bF for ; Wed, 03 Dec 2025 04:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764734804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBEGdl1RS4ZfLTqi2LS6akYBiCJIW+xdfMABDQxIzcU=; b=gXTukMZyrZQ0+evP8Q4+x9LbQt43RHaqC7dYEOAI63KU8pM4w43sz0oKfIo1Qn3zcq80AS RXo38HB5WojWFVfjX2N6iCmxBs3whKk1zK8Vi69DLba/QIhe9Vk4cxt/Uya61/MmxY185w v5cilLRfZO99wCjlsVrSVKH2MbuUWhkfy9QWSsYhhLy1rYrkvPvp9pz0Woi/nY8Eox+Jd/ X7DucKqwb3aCYI955lypowb/UtDTVo/RNftpd6Epy+tZiW8gdN5uICtCZVdK1Nv2Z0qD+b IJBcmJ0yHcimRWzMsetfodvKidQCQOxPCwlT3rLpHkk81UXG0PBAH3Bq0A3LUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764734804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBEGdl1RS4ZfLTqi2LS6akYBiCJIW+xdfMABDQxIzcU=; b=nf2C6+lujPkYg3/gCfN68F/JM3wEhcTWDBmwj0BwodcISRaGMkx7bQytCrA6awxQh427jJ /gupFpTXsRXqPXG7O7Hhheyhy3E7hC2I+eo4pTTooKVpXpFFiUgs0QQjXBreXsg8i7xjug unPFGK7+XIGdQOK9eZp7ttAChgLgQ6N0yrVJQNFlYc8lFk2OHHVvi30bFxUnNVT0yxodt2 A4Ka23POM6Spcfyd+FIPGFehzmE1mqNqzc4vHPrBOvcOkXj33grFdrMny6PRou0T+4keqO gj2yfEmeFdcNjTtM79KUiWSDyxn3eDcHEsAMJgwFi3Q/8KQvoXUzHKzcw6qSEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764734804; a=rsa-sha256; cv=none; b=OcweAMt8qCNUu2IQl6tDyY1ASXR6RMmxyrAbS3jVTsxii26/Ktoe/oAlpYeb7wX7mHpAwt A5NVVMJwE6osTWuRaXXf6CidDTHsN7G76wqT7BH2HjkBCgvbROnEXsmFtcJgdgiELvMJr6 l1FNEvDdDwMV3jVgrXRYHiTN0BKbMAWz0OwMllX4xuYOFGP+WEmR85OGEEO75wXYPGLDhA JNcbZx2jzXEkVR8Fz6rRxKtg9qQiaYdlVmfaUAgoRu9tKIRuBsPp51dwbWZ2AH3j5GG33D Udt/ojTWwWPpW+8/MrgVl9R6WVmmy8MYiwad7KpzDWOZBfraff0J3cs0kgVVZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLkbm2MGvz6RF for ; Wed, 03 Dec 2025 04:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3936c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 04:06:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 0e60cb8c6a4e - main - ufshci: Add a Auto Hibernate quirk to Intel Alder Lake-N List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e60cb8c6a4e9cf943b7360cbd9e9a390f545a10 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 04:06:44 +0000 Message-Id: <692fb754.3936c.6e5aa406@gitrepo.freebsd.org> The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=0e60cb8c6a4e9cf943b7360cbd9e9a390f545a10 commit 0e60cb8c6a4e9cf943b7360cbd9e9a390f545a10 Author: Jaeyoon Choi AuthorDate: 2025-12-03 04:06:09 +0000 Commit: Jaeyoon Choi CommitDate: 2025-12-03 04:06:09 +0000 ufshci: Add a Auto Hibernate quirk to Intel Alder Lake-N Alder Lake-N supports Auto Hibernate, but it does not work. Reviewed by: imp (mentor) Sponsored by: Samsung Electronics Differential Revision: https://reviews.freebsd.org/D54006 --- sys/dev/ufshci/ufshci_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/ufshci/ufshci_pci.c b/sys/dev/ufshci/ufshci_pci.c index b2a958f1cd1a..6a4182a55a7d 100644 --- a/sys/dev/ufshci/ufshci_pci.c +++ b/sys/dev/ufshci/ufshci_pci.c @@ -60,7 +60,8 @@ static struct _pcsid { UFSHCI_QUIRK_WAIT_AFTER_POWER_MODE_CHANGE | UFSHCI_QUIRK_CHANGE_LANE_AND_GEAR_SEPARATELY | UFSHCI_QUIRK_BROKEN_AUTO_HIBERNATE }, - { 0x54ff8086, "Intel UFS Host Controller", UFSHCI_REF_CLK_19_2MHz }, + { 0x54ff8086, "Intel Alder Lake-N UFS Host Controller", + UFSHCI_REF_CLK_19_2MHz, UFSHCI_QUIRK_BROKEN_AUTO_HIBERNATE }, { 0x00000000, NULL } }; static int From nobody Wed Dec 3 04:40:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLlMD739zz6Jpfq for ; Wed, 03 Dec 2025 04:40: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLlM76PP6z47HF for ; Wed, 03 Dec 2025 04:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764736851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/oZt6h6fVTa4/rQD9jkS7ASM77OY0eBcG1bWxd18vWQ=; b=pYoM20aLjMbAED283j4i4CRLAKpyAio/Uguv8hIitZMaMqMXQ4m1xBSqf1p7LSFmkf6fm+ 1oLFKsCUdhuYBS1zxrv90VH8BZ85GxZfeBIcReagw1foRLdEmMr6wdrQxN4GtBj+y80wwI 9s1WO8OP/befTMcUtBxk2yvmH2LUdQBQZQZF5zqPeLSJ1iqfySCRfCMZlGSZAStLLvlra7 PRHFMRTsSHBq7toGvmg4bSTFrv+EJbLbD2HBfvwe5qXcXXkgQM/4el9dbkMqgw01Pi7fiU 6hETPkctkDCrw8kQ4Z4yMEC8jRAXO8NIaGR7G4EeANCeQ3g48CSWlGDC8JuTnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764736851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/oZt6h6fVTa4/rQD9jkS7ASM77OY0eBcG1bWxd18vWQ=; b=a22ohOAIG4fZqwH7UWpCTvXI8UisCBqSlbIxx6/+VaN7YlUrwMs9ticcPncr313iKlvisv fK4fhSR4ZYS6ZhW5ZfoyJU3MMhT4PmzRtN+MO0VEhYjf5s7APGN5gyxU6j7Zmk2Yt/T+cn 58DQslp2jAqXkWWnL2pqRqrTg25VOZXcN5Rsy54SBJKaVt55Ik+uzyab4FOxBo06MHRbUW ltk/mBxbFoSP2EPGYolFlzp3ok7MkOSwTiay2qKsNsV6kYN3r/nKf9qGXqzN+5Q5nXRZlo DwvttHSG6tuP0lRcoXpzZk0/C9un7WVQ/V0B/r3gcf7XG2T5Zln3XxnVVtSUTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764736851; a=rsa-sha256; cv=none; b=g1PzP5+WrgW2e3ixM9gwItklkfclmJjZOM34iVDB69utxloDjxDo9nT164fOqtHQtNVo8k ZDq8uXCFlgd8X6+GO4tbziF3XXJYTEXFASWLlVVw8na/nnyEuKupIPN06aJb+hwRMivkDA CfRB+a2j7e8HkWtBkQToTzx1L/0kVWu5drHBFSQvt2NicsXvpbtFWOfnlhvUP6SRXQAzSN pkOl8zsKP+9fhL0WhSfVPGsjFZ2nNBHSvN6daN2Xdpmn9+7Kk1hjdk7gQz/Hj+QRvxgRpM fnGi+aLIIuGLLJ8f3o/U/LqHldrGnM4rwYLR65IHPEql+YZmv+rdOmVfM5i1yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLlM7612Jz6nf for ; Wed, 03 Dec 2025 04:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d6b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 04:40:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 618347747494 - main - kqueue(9): document f_copy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 618347747494f0c0842edbdfe29bacf533b10d0f Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 04:40:51 +0000 Message-Id: <692fbf53.3d6b9.17cac8b2@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=618347747494f0c0842edbdfe29bacf533b10d0f commit 618347747494f0c0842edbdfe29bacf533b10d0f Author: Warner Losh AuthorDate: 2025-12-03 04:40:47 +0000 Commit: Warner Losh CommitDate: 2025-12-03 04:40:47 +0000 kqueue(9): document f_copy f_copy controls whether and how a knote is inherited by the child process. Sponsored by: Netflix Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53845 --- share/man/man9/kqueue.9 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/share/man/man9/kqueue.9 b/share/man/man9/kqueue.9 index 8214d7c01673..bc73530226f0 100644 --- a/share/man/man9/kqueue.9 +++ b/share/man/man9/kqueue.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 18, 2023 +.Dd December 2, 2025 .Dt KQUEUE 9 .Os .Sh NAME @@ -197,6 +197,18 @@ function of the that the .Va knote was added to. +.It Va f_copy +The +.Va f_copy +function is called to copy notes when the process forks. +When +.Dv NULL , +the current node is not duplicated to the child process. +Filter might set +.Dv f_copy +to +.Fn knote_triv_copy +if there is no additional handling required, besides shallow copying of the knote itself. .El .Pp The function From nobody Wed Dec 3 05:04:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLltQ0x45z6HcQc for ; Wed, 03 Dec 2025 05:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLltP6rV1z49pc for ; Wed, 03 Dec 2025 05:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764738269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eB65YDxFoyEm2J/5rf4wRJsjwWsIkP6IQDvo6zBrOPg=; b=FbETYZFSf3anAuCIgQd/VcLt8P6ot2H5rsmXXS0UIVG4qDS1qjV5et3yXu7yivyYkIx693 2l6jOOrFZMiri6BjOdFvHnCA3nawUBi6eU/Qxh3NSVWrQRdX3QGfjTXuXbrTCAO4/F3Ob3 EG7/bfQtVeCRfU8NyEASbGZT6zPnSiiLNcpn14N8snVxTiN3YTycpKVEGUj6vYCH9Frtus NRbiLZjxOYkTFSfQlnGJZjeV+3MOdlMaOy6qApbwXHxSLVmQcgk6EgAhUVhrGGPRgYx9ya RKlOlg+GmtQF4g4VSxpmRv5UeZ5x1NO64Tc2fTmuRaY0TV34Qw272KZN3ZZmQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764738269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eB65YDxFoyEm2J/5rf4wRJsjwWsIkP6IQDvo6zBrOPg=; b=X03lpAGMfD06pZM2DBTALjCKRT4MQ0Ifk6DWyMA24TY+rv0g05WVpmUkXhC/qepwDNXRUf 2TIe+q0Fuy1U03TgnLLQiv+sfsHcbZR/IJ33p2uQEY4Z2Ruq2kMQ5Mqk6x9kjxPLtzPZXE 9m+FiH04HTz3BXbDEfNdHtGwP/ZHx+6+IkTOYttWhxCmSU9ZkT4GJ0jYwFc36Y0rsQg39e NE8ozVj3yga4IsPZCU7JhbHL1aHKRAmi6Gh5Knl4FH+fYnMzB0jdwwV00rit2dgYI7ynFD uBiECuc+1evZ+qACjXX3kQXe6yZ3Xbour9RQFLY3NX+wTvG1754u4Ih6YeSQqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764738269; a=rsa-sha256; cv=none; b=k8D0t5sGKtCkQAXo8wDrLZom/G36p0Jt+hvOzPiohnDX1skQo+FQLqYecjV/vXy4ojtk26 TlMpvnKXInVZjUnTV594Rdh1WKWVHCZNs0WeqYkK4jYaz9e06qG3L8I+L1XcAD8v3RYK3n H8U+3ppczaphq9FqeNGzV4zOvtSUyQqj4BYQWIvf0/wpe+CDyWF/cZozFVbJx/o5DWpebz bMQsYo3uRkCKDD/sb+6MhrWA7uEFwxM0EUN6UJqi4ELf6VMr5sGKuwhbKmyH7Sqq6oZoBc 9HCDqE6bs1SUeXNUHw6aNmWJKaAQAz639hRb2gGc4qGOFp58MfVE+He7i7Db/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLltP694vz7nm for ; Wed, 03 Dec 2025 05:04:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d26b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 05:04:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7b71f57f4e51 - main - netinet: Remove left-over sys/cdefs.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b71f57f4e514a2ab7308ce4147e14d90e099ad0 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 05:04:29 +0000 Message-Id: <692fc4dd.3d26b.67b6aed5@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7b71f57f4e514a2ab7308ce4147e14d90e099ad0 commit 7b71f57f4e514a2ab7308ce4147e14d90e099ad0 Author: Warner Losh AuthorDate: 2025-12-03 05:02:10 +0000 Commit: Warner Losh CommitDate: 2025-12-03 05:02:10 +0000 netinet: Remove left-over sys/cdefs.h These were for $FreeBSD$ that was removed a while ago, but these includes didn't get swept up in that. Remove them all now. Sponsored by: Netflix MFC After: 2 weeks --- sys/netinet/accf_data.c | 1 - sys/netinet/accf_http.c | 1 - sys/netinet/accf_tls.c | 1 - sys/netinet/if_ether.c | 1 - sys/netinet/igmp.c | 1 - sys/netinet/in.c | 1 - sys/netinet/in_debug.c | 1 - sys/netinet/in_fib.c | 1 - sys/netinet/in_fib_algo.c | 1 - sys/netinet/in_fib_dxr.c | 1 - sys/netinet/in_gif.c | 1 - sys/netinet/in_jail.c | 1 - sys/netinet/in_pcb.c | 1 - sys/netinet/in_proto.c | 1 - sys/netinet/ip_carp.c | 1 - sys/netinet/ip_divert.c | 1 - sys/netinet/ip_ecn.c | 1 - sys/netinet/ip_encap.c | 1 - sys/netinet/ip_fastfwd.c | 1 - sys/netinet/ip_gre.c | 1 - sys/netinet/ip_icmp.c | 1 - sys/netinet/ip_id.c | 1 - sys/netinet/ip_input.c | 1 - sys/netinet/ip_mroute.c | 1 - sys/netinet/ip_options.c | 1 - sys/netinet/ip_output.c | 1 - sys/netinet/ip_reass.c | 1 - sys/netinet/sctp_crc32.c | 1 - sys/netinet/sctp_module.c | 1 - sys/netinet/sctp_syscalls.c | 1 - sys/netinet/tcp_ecn.c | 1 - sys/netinet/tcp_fastopen.c | 1 - sys/netinet/tcp_hostcache.c | 1 - sys/netinet/tcp_hpts.c | 1 - sys/netinet/tcp_hpts_test.c | 1 - sys/netinet/tcp_input.c | 1 - sys/netinet/tcp_log_buf.c | 1 - sys/netinet/tcp_lro.c | 1 - sys/netinet/tcp_lro_hpts.c | 1 - sys/netinet/tcp_offload.c | 1 - sys/netinet/tcp_output.c | 1 - sys/netinet/tcp_ratelimit.c | 1 - sys/netinet/tcp_reass.c | 1 - sys/netinet/tcp_sack.c | 1 - sys/netinet/tcp_subr.c | 1 - sys/netinet/tcp_syncache.c | 1 - sys/netinet/tcp_timer.c | 1 - sys/netinet/tcp_timewait.c | 1 - sys/netinet/tcp_usrreq.c | 1 - sys/netinet/toecore.c | 1 - sys/netinet/udp_usrreq.c | 1 - sys/netinet6/dest6.c | 1 - sys/netinet6/frag6.c | 1 - sys/netinet6/icmp6.c | 1 - sys/netinet6/in6.c | 1 - sys/netinet6/in6_fib.c | 1 - sys/netinet6/in6_fib_algo.c | 1 - sys/netinet6/in6_gif.c | 1 - sys/netinet6/in6_jail.c | 1 - sys/netinet6/in6_mcast.c | 1 - sys/netinet6/in6_pcb.c | 1 - sys/netinet6/in6_proto.c | 1 - sys/netinet6/in6_src.c | 1 - sys/netinet6/ip6_fastfwd.c | 1 - sys/netinet6/ip6_forward.c | 1 - sys/netinet6/ip6_gre.c | 1 - sys/netinet6/ip6_id.c | 1 - sys/netinet6/ip6_input.c | 1 - sys/netinet6/ip6_mroute.c | 1 - sys/netinet6/ip6_output.c | 1 - sys/netinet6/mld6.c | 1 - sys/netinet6/nd6.c | 1 - sys/netinet6/nd6_nbr.c | 1 - sys/netinet6/nd6_rtr.c | 1 - sys/netinet6/route6.c | 1 - sys/netinet6/udp6_usrreq.c | 1 - 76 files changed, 76 deletions(-) diff --git a/sys/netinet/accf_data.c b/sys/netinet/accf_data.c index d5ada4ed12df..9ba1fd1e7479 100644 --- a/sys/netinet/accf_data.c +++ b/sys/netinet/accf_data.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #define ACCEPT_FILTER_MOD #include diff --git a/sys/netinet/accf_http.c b/sys/netinet/accf_http.c index f06fd64de576..9b76e3cfd316 100644 --- a/sys/netinet/accf_http.c +++ b/sys/netinet/accf_http.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #define ACCEPT_FILTER_MOD #include diff --git a/sys/netinet/accf_tls.c b/sys/netinet/accf_tls.c index 9f1ed7000474..a0b357fe949c 100644 --- a/sys/netinet/accf_tls.c +++ b/sys/netinet/accf_tls.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #define ACCEPT_FILTER_MOD #include diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index dc6ef343662d..ff60803f4517 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -35,7 +35,6 @@ * add "inuse/lock" bit (or ref. count) along with valid bit */ -#include #include "opt_inet.h" #include diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 299f3c2e02bb..ad22efb16495 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -47,7 +47,6 @@ * MULTICAST Revision: 3.5.1.4 */ -#include #include "opt_ddb.h" #include diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 70a61dbf93a3..19ab485bc75f 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #define IN_HISTORICAL_NETS /* include class masks */ diff --git a/sys/netinet/in_debug.c b/sys/netinet/in_debug.c index 7535e99f4d4e..513804d5da32 100644 --- a/sys/netinet/in_debug.c +++ b/sys/netinet/in_debug.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ddb.h" #include diff --git a/sys/netinet/in_fib.c b/sys/netinet/in_fib.c index f6bb6bdbb50a..0bcda9fdd312 100644 --- a/sys/netinet/in_fib.c +++ b/sys/netinet/in_fib.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_route.h" diff --git a/sys/netinet/in_fib_algo.c b/sys/netinet/in_fib_algo.c index 95621c300064..ab2743034c48 100644 --- a/sys/netinet/in_fib_algo.c +++ b/sys/netinet/in_fib_algo.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index 538cd43a88a3..c0e805e6d178 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -42,7 +42,6 @@ * lookups per second on commodity CPUs, IEEE SoftCOM, September 2017, Split */ -#include #include "opt_inet.h" #include diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index e25a08bb60cf..ebe7a4a62903 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -32,7 +32,6 @@ * $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/in_jail.c b/sys/netinet/in_jail.c index 7b2120f575ca..141164f894e3 100644 --- a/sys/netinet/in_jail.c +++ b/sys/netinet/in_jail.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ddb.h" #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index b7dae78fb2c2..9610ce2fe363 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -36,7 +36,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ddb.h" #include "opt_ipsec.h" #include "opt_inet.h" diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 42a6cf0b5810..3ec515d216fa 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_mrouting.h" #include "opt_ipsec.h" #include "opt_inet.h" diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 4f553b9aac5e..d33ac4e9a154 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -28,7 +28,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "opt_bpf.h" #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 5a561814cdb5..a88497a71019 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_sctp.h" diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c index 2f700c43bbfa..0166c8b5d9c5 100644 --- a/sys/netinet/ip_ecn.c +++ b/sys/netinet/ip_ecn.c @@ -36,7 +36,6 @@ * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c index 6de799dec1d9..d3ca0b19f2f5 100644 --- a/sys/netinet/ip_encap.c +++ b/sys/netinet/ip_encap.c @@ -58,7 +58,6 @@ * The code will let you match protocol via src/dst address pair. */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index 51e7c2fbc4b0..d3d42afb2d84 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -67,7 +67,6 @@ * is being followed here. */ -#include #include "opt_ipstealth.h" #include "opt_sctp.h" diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 01a6ef4cd670..8175155cc2c0 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -34,7 +34,6 @@ * $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index fc0848b2c944..adf69c47aed5 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c index 738b7eceb448..4a224a157a56 100644 --- a/sys/netinet/ip_id.c +++ b/sys/netinet/ip_id.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * IP ID generation is a fascinating topic. * diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 4d614dfeb0a2..6ddec6726428 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_bootp.h" #include "opt_inet.h" #include "opt_ipstealth.h" diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index d30bd42ec578..f9efdc419882 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -67,7 +67,6 @@ * TODO: Sync ip6_mroute.c with this file. */ -#include #include "opt_inet.h" #include "opt_mrouting.h" diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c index a9d6836d9e97..285bdad46272 100644 --- a/sys/netinet/ip_options.c +++ b/sys/netinet/ip_options.c @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ipstealth.h" #include diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index ef08b9cfd3d6..a6b29c6a7612 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_ipsec.h" #include "opt_kern_tls.h" diff --git a/sys/netinet/ip_reass.c b/sys/netinet/ip_reass.c index 177069f5e010..510a300ed6ef 100644 --- a/sys/netinet/ip_reass.c +++ b/sys/netinet/ip_reass.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_rss.h" #include diff --git a/sys/netinet/sctp_crc32.c b/sys/netinet/sctp_crc32.c index 60d8bc38735a..c9647ceccc66 100644 --- a/sys/netinet/sctp_crc32.c +++ b/sys/netinet/sctp_crc32.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "opt_sctp.h" #include diff --git a/sys/netinet/sctp_module.c b/sys/netinet/sctp_module.c index 2e229658efd9..4af7776433c0 100644 --- a/sys/netinet/sctp_module.c +++ b/sys/netinet/sctp_module.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index 9d85576e2592..80d1d58a7866 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -28,7 +28,6 @@ * */ -#include #include "opt_capsicum.h" #include "opt_sctp.h" #include "opt_ktrace.h" diff --git a/sys/netinet/tcp_ecn.c b/sys/netinet/tcp_ecn.c index 5332b3caf950..31b9418c5fc2 100644 --- a/sys/netinet/tcp_ecn.c +++ b/sys/netinet/tcp_ecn.c @@ -54,7 +54,6 @@ * https://tools.ietf.org/html/draft-ietf-tcpm-accurate-ecn-09 */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index 609637b83df3..fb1386c03d22 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -163,7 +163,6 @@ * */ -#include #include "opt_inet.h" #include diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c index df639876a85c..e5c20b6f2475 100644 --- a/sys/netinet/tcp_hostcache.c +++ b/sys/netinet/tcp_hostcache.c @@ -65,7 +65,6 @@ * followed here. */ -#include #include "opt_inet6.h" #include diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index c54459bb5f01..29a55c1a7e39 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. * */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_rss.h" diff --git a/sys/netinet/tcp_hpts_test.c b/sys/netinet/tcp_hpts_test.c index c5dc9cb5b03b..61082adc9063 100644 --- a/sys/netinet/tcp_hpts_test.c +++ b/sys/netinet/tcp_hpts_test.c @@ -26,7 +26,6 @@ */ #include -#include #include "opt_inet.h" #include #include diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 9c58c2815d13..85ab26351f6b 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -47,7 +47,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index 473c534ef83d..4505171d94d0 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -27,7 +27,6 @@ * */ -#include #include "opt_inet.h" #include "opt_ddb.h" #include diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index 9b5baf115855..3b04d757c0f9 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c index ac1a27a4290a..99989d2833c0 100644 --- a/sys/netinet/tcp_lro_hpts.c +++ b/sys/netinet/tcp_lro_hpts.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c index 6a362484d46f..20bc1df9e15c 100644 --- a/sys/netinet/tcp_offload.c +++ b/sys/netinet/tcp_offload.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 208f72c4661c..23085f67d5f9 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet/tcp_ratelimit.c b/sys/netinet/tcp_ratelimit.c index a0e837cc7d76..ad5fdb25205c 100644 --- a/sys/netinet/tcp_ratelimit.c +++ b/sys/netinet/tcp_ratelimit.c @@ -31,7 +31,6 @@ * Author: Randall Stewart */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 5f73e83dc8a9..d1a70e4db3a3 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 6e08ad2796a8..13cc7b0de157 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -69,7 +69,6 @@ * Research Laboratory (NRL). */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index b6f428b279b3..6b0aa76527f4 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 6c072e0fec38..056542bc43d6 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 57c57666fa3a..b409daf5895e 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_rss.h" diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index ce63fcf9ffc0..3afa3c0ac1c1 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index aeb28cd6a144..a0658e18fb1e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -35,7 +35,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ddb.h" #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/toecore.c b/sys/netinet/toecore.c index 4203029ff7c3..1c4e89069a4b 100644 --- a/sys/netinet/toecore.c +++ b/sys/netinet/toecore.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index f1d952037d5a..75782765bc98 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -36,7 +36,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c index 85ce894c40c3..e8b60fe79101 100644 --- a/sys/netinet6/dest6.c +++ b/sys/netinet6/dest6.c @@ -31,7 +31,6 @@ * $KAME: dest6.c,v 1.59 2003/07/11 13:21:16 t-momose Exp $ */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index f6bb6e94ed08..7d71e1327934 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -32,7 +32,6 @@ * $KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $ */ -#include #include "opt_rss.h" #include diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index f98381499b2d..c05850f1477b 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -60,7 +60,6 @@ * SUCH DAMAGE. */ -#include #define MBUF_PRIVATE /* XXXRW: Optimisation tries to avoid M_EXT mbufs */ #include "opt_inet.h" diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index b98703bdfbfe..f2a032585342 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -60,7 +60,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet6/in6_fib.c b/sys/netinet6/in6_fib.c index 3e8b8ccce7aa..95094a1ace76 100644 --- a/sys/netinet6/in6_fib.c +++ b/sys/netinet6/in6_fib.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_route.h" diff --git a/sys/netinet6/in6_fib_algo.c b/sys/netinet6/in6_fib_algo.c index ef5cfc6d5ef6..47c1f7d20786 100644 --- a/sys/netinet6/in6_fib_algo.c +++ b/sys/netinet6/in6_fib_algo.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet6.h" #include diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index 2bab1c57ce2a..5159faa1e2e8 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -32,7 +32,6 @@ * $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $ */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet6/in6_jail.c b/sys/netinet6/in6_jail.c index 5abdef9ab711..84057f3f9649 100644 --- a/sys/netinet6/in6_jail.c +++ b/sys/netinet6/in6_jail.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ddb.h" #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c index a6186568ecb2..613bd14428bb 100644 --- a/sys/netinet6/in6_mcast.c +++ b/sys/netinet6/in6_mcast.c @@ -34,7 +34,6 @@ * Normative references: RFC 2292, RFC 3492, RFC 3542, RFC 3678, RFC 3810. */ -#include #include "opt_inet6.h" #include diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index dfda0c60c0ba..f2eb00161690 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -64,7 +64,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index f567b42b42ca..a566ca6b0fb0 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -60,7 +60,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 3e55c6e5fc05..5171bc1d4ea6 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -60,7 +60,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include diff --git a/sys/netinet6/ip6_fastfwd.c b/sys/netinet6/ip6_fastfwd.c index 7139267722b7..9298b8ea9a49 100644 --- a/sys/netinet6/ip6_fastfwd.c +++ b/sys/netinet6/ip6_fastfwd.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "opt_inet6.h" #include "opt_ipstealth.h" #include "opt_sctp.h" diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index f6c09b0ac7bc..9823366b0156 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -31,7 +31,6 @@ * $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $ */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet6/ip6_gre.c b/sys/netinet6/ip6_gre.c index 9ba45cb294e9..952b132e4cf7 100644 --- a/sys/netinet6/ip6_gre.c +++ b/sys/netinet6/ip6_gre.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c index 7c39bcf943bc..73e48d8c840d 100644 --- a/sys/netinet6/ip6_id.c +++ b/sys/netinet6/ip6_id.c @@ -63,7 +63,6 @@ * $OpenBSD: ip6_id.c,v 1.3 2003/12/12 06:57:12 itojun Exp $ */ -#include /* * seed = random (bits - 1) bit * n = prime, g0 = generator to n, diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 99dad1e7c309..380391fd71f4 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -60,7 +60,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index f3c68d61f245..4473d3931af8 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -78,7 +78,6 @@ * MROUTING Revision: 3.5.1.2 + PIM-SMv2 (pimd) Support */ -#include #include "opt_inet6.h" #include diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 6299ce6e146b..8ade50b13568 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -60,7 +60,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 5dfe48908a4f..fd0a1503a6e5 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -63,7 +63,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 00df5efcef92..a62b26d27250 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -31,7 +31,6 @@ * $KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $ */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_route.h" diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 29151b29a071..aa7cb3b41973 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -31,7 +31,6 @@ * $KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $ */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 10f0342f2bc4..224cd7e56b4d 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -31,7 +31,6 @@ * $KAME: nd6_rtr.c,v 1.111 2001/04/27 01:37:15 jinmei Exp $ */ -#include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c index e570c77db3d3..9cf5ecb519b1 100644 --- a/sys/netinet6/route6.c *** 21 LINES SKIPPED *** From nobody Wed Dec 3 05:26:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLmNC6XnLz6Hf4L for ; Wed, 03 Dec 2025 05:26:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) (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 4dLmNC0Hv8z3DFM for ; Wed, 03 Dec 2025 05:26:51 +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=vKQLgz8w; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::62d) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-29853ec5b8cso76898125ad.3 for ; Tue, 02 Dec 2025 21:26:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1764739604; x=1765344404; 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=SGQybfttdsvorhLlm05XwE76pvK5uQZ4bK6zt2r2zm8=; b=vKQLgz8wczWvcNvKLHWBPRrhmMMJIqxu/YXfSNV2YUMmnyB7cwSc9xj3XkI/c5aWse jel+wfosTdkHt+CTLrsmDEiKKmxx9aVGpK/BRV0/sWHk0nQ3ccdm5bbxenaqkQkoYa3W slzJLdZ4B3EqCPIqdx9AuXmlOZMlPEEhPPvkLCMefW0O32RrBB04s8LydSXrfSlBcdVi BrUuxbIZSscAqmKwf8SzppXKb0NfJb5Mw22wJSuAi8/aZk3SF9BuxCy6R9w29mB7faAg QDUR3srn1KfS9CE1MvETpkvzdgoGcA5UmcbK2DK/WruJxIw0hGLqYge/olGq1lTbz+Fy jM+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764739604; x=1765344404; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SGQybfttdsvorhLlm05XwE76pvK5uQZ4bK6zt2r2zm8=; b=p41W/kcOVTz07Th46MLWawv4oDtHQQeemSOaY/9YHk4lbQ2JZ9jWUi6bvFjYGfgut5 1v2yoNAO1k/4zObxsiApVE29b/JEt+O5aDmUA9LWjyWrITnWTIDqLuiVwKEM52KfXFya EJjqQgHojppH6Hjec1pRvGtnFeySn2F5qx9ggBB16HpBajNY6DAIP/AJBVPJg6kZNH7k WHMHHpVcZA+XFAewrbr4Zk/oWvd5bH2JYNjQIuMT0jGSrONVkMGnFFUDjewwfqKBk++v nODfQ1jSgRdYw1qwT57YaPZnoRygAlzGFj6GMvrGjy090UuQ19zoSkhVCDzU9blYK0Qm DPZA== X-Forwarded-Encrypted: i=1; AJvYcCXQxNAewWyOIWc3Ri+RbQ8WrpkrW+hthJg9yR+z+AvjTWKxEGf3W4kuaibLqm8Q3qFTOPzHkDUjrbGuY7RPN26qy0+MuQ==@freebsd.org X-Gm-Message-State: AOJu0YzdlEHLsIdUmwc8upMsn4oN0UKpGsBZgwy+MARHJDyOq2NMXTrm 9GavuWwkepvIE/zarEYs9KxRZLTXtaCi5sxIjebme/a1CdH4+apuc02d13Zn+oBsZSNHXIx5LSW 5Zgqg8SRBOguUurpS1W47+57PW8Qb0F+caKGWZwFWzw== X-Gm-Gg: ASbGncsgUk1mGyqmhknc0NGITOLLI20upuxtym78Wd/qfY9BpVQhB9InQipkUfgK4/D S6wK0/rkLt5Z0DLmsnFazY3yiwt0pZO4oJG+4Hcj/kXlKHBMd2D7FoS6GMm7u7zFDvQmrIAg3dm SsgUVslId3YId/6L+xk+7zwchSbqr1v5TtvpsNRzCfwPpacESGL9GXEkyBXZW4BYKVoDLyDplR5 j1pCj3YSfgWND8CqGlte6prb4NUw48vLthHXwEkxTLAc+wx/ID7RWk41NyEQJHqTM2GK+W4hXDf +1GEmg== X-Google-Smtp-Source: AGHT+IGcSXhSgJF2I3MFFri6R7N5MSbh/XYj/PiHIxAfNDEV6erbIl8+tKXWI5nIS+h8i7q0ir1VZQ2T34uRXieeoQM= X-Received: by 2002:a17:902:e94e:b0:297:f8d9:aae7 with SMTP id d9443c01a7336-29d683add85mr12986925ad.46.1764739604384; Tue, 02 Dec 2025 21:26:44 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <692a8ea7.feb1.63d10382@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 2 Dec 2025 22:26:33 -0700 X-Gm-Features: AWmQ_bnXC4KBKqg_64Yynj09uRHbyCOMinVOJSbAjjpVnxQ8THb6-0qJicixXSk Message-ID: Subject: Re: git: f42421307b11 - main - sys: remove armv6/6.1 support from debug monitor To: John Baldwin Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Minsoo Choo Content-Type: multipart/alternative; boundary="0000000000003d9f6a06450575a8" X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; 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:~]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::62d:from]; DMARC_NA(0.00)[bsdimp.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; R_SPF_NA(0.00)[no SPF record]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] X-Rspamd-Queue-Id: 4dLmNC0Hv8z3DFM --0000000000003d9f6a06450575a8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Dec 1, 2025 at 8:18=E2=80=AFAM John Baldwin wrote= : > On 11/29/25 01:11, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Df42421307b115345ea1a6c8fdf61fbb= 581e4400f > > > > commit f42421307b115345ea1a6c8fdf61fbb581e4400f > > Author: Minsoo Choo > > AuthorDate: 2025-11-29 00:34:40 +0000 > > Commit: Warner Losh > > CommitDate: 2025-11-29 04:56:36 +0000 > > > > sys: remove armv6/6.1 support from debug monitor > > > > Signed-off-by: Minsoo Choo > > Reviewed by: imp > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1903 > > --- > > sys/arm/arm/debug_monitor.c | 30 ------------------------------ > > 1 file changed, 30 deletions(-) > > > > diff --git a/sys/arm/arm/debug_monitor.c b/sys/arm/arm/debug_monitor.c > > index 7944becbae4d..4d61896a2142 100644 > > --- a/sys/arm/arm/debug_monitor.c > > +++ b/sys/arm/arm/debug_monitor.c > > @@ -83,8 +83,6 @@ static uint32_t dbg_breakpoint_num; > > #define ID_DFR0_CP_DEBUG_M_SHIFT 0 > > #define ID_DFR0_CP_DEBUG_M_MASK (0xF << > ID_DFR0_CP_DEBUG_M_SHIFT) > > #define ID_DFR0_CP_DEBUG_M_NS (0x0) /* Not supported */ > > -#define ID_DFR0_CP_DEBUG_M_V6 (0x2) /* v6 Debug arch. > CP14 access */ > > -#define ID_DFR0_CP_DEBUG_M_V6_1 (0x3) /* v6.1 Debug arch. > CP14 access */ > > #define ID_DFR0_CP_DEBUG_M_V7 (0x4) /* v7 Debug arch. > CP14 access */ > > #define ID_DFR0_CP_DEBUG_M_V7_1 (0x5) /* v7.1 Debug arch. > CP14 access */ > > Humm, I would have probably left these as the register is still valid and > I find it > useful to describe the full range of values for registers that we define > constants for. > The rest of the removal certainly makes sense. > Sure. > > > > @@ -594,10 +592,6 @@ dbg_enable_monitor(void) > > dbg_dscr =3D cp14_dbgdscrint_get(); > > > > switch (dbg_model) { > > - case ID_DFR0_CP_DEBUG_M_V6: > > - case ID_DFR0_CP_DEBUG_M_V6_1: /* fall through */ > > - cp14_dbgdscr_v6_set(dbg_dscr | DBGSCR_MDBG_EN); > > - break; > > Should this function also be removed? Looks to be defined here in > sys/arm/include/cpu.h: > > _WF1(cp14_dbgdscr_v6_set, CP14_DBGDSCRext_V6(%0)) > OK. I'll do these tweaks.. Warner --0000000000003d9f6a06450575a8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Dec 1, = 2025 at 8:18=E2=80=AFAM John Baldwin <jhb@freebsd.org> wrote:
On 11/29/25 01:11, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3Df42421307b115345ea1a6c8fdf61fbb581e4400f<= /a>
>
> commit f42421307b115345ea1a6c8fdf61fbb581e4400f
> Author:=C2=A0 =C2=A0 =C2=A0Minsoo Choo <minsoochoo0122@proton.me>
> AuthorDate: 2025-11-29 00:34:40 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2025-11-29 04:56:36 +0000
>
>=C2=A0 =C2=A0 =C2=A0 sys: remove armv6/6.1 support from debug monitor >=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Signed-off-by: Minsoo Choo <minsoochoo0122@proton.me>=
>=C2=A0 =C2=A0 =C2=A0 Reviewed by: imp
>=C2=A0 =C2=A0 =C2=A0 Pull Request: https://githu= b.com/freebsd/freebsd-src/pull/1903
> ---
>=C2=A0 =C2=A0sys/arm/arm/debug_monitor.c | 30 -------------------------= -----
>=C2=A0 =C2=A01 file changed, 30 deletions(-)
>
> diff --git a/sys/arm/arm/debug_monitor.c b/sys/arm/arm/debug_monitor.c=
> index 7944becbae4d..4d61896a2142 100644
> --- a/sys/arm/arm/debug_monitor.c
> +++ b/sys/arm/arm/debug_monitor.c
> @@ -83,8 +83,6 @@ static uint32_t dbg_breakpoint_num;
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0ID_DFR0_CP_DEBUG_M_SHIFT=C2=A0 = =C2=A0 =C2=A0 =C2=A0 0
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0ID_DFR0_CP_DEBUG_M_MASK=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0(0xF << ID_DFR0_CP_DEBUG_M_SHIFT)
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0ID_DFR0_CP_DEBUG_M_NS=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(0x0) /* Not supported */
> -#define=C2=A0 =C2=A0 =C2=A0 ID_DFR0_CP_DEBUG_M_V6=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0(0x2) /* v6 Debug arch. CP14 access */
> -#define=C2=A0 =C2=A0 =C2=A0 ID_DFR0_CP_DEBUG_M_V6_1=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0(0x3) /* v6.1 Debug arch. CP14 access */
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0ID_DFR0_CP_DEBUG_M_V7=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(0x4) /* v7 Debug arch. CP14 access */
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0ID_DFR0_CP_DEBUG_M_V7_1=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0(0x5) /* v7.1 Debug arch. CP14 access */

Humm, I would have probably left these as the register is still valid and I= find it
useful to describe the full range of values for registers that we define co= nstants for.
The rest of the removal certainly makes sense.

Sure.
=C2=A0
>=C2=A0 =C2=A0
> @@ -594,10 +592,6 @@ dbg_enable_monitor(void)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0dbg_dscr =3D cp14_dbgdscrint_get();
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0switch (dbg_model) {
> -=C2=A0 =C2=A0 =C2=A0case ID_DFR0_CP_DEBUG_M_V6:
> -=C2=A0 =C2=A0 =C2=A0case ID_DFR0_CP_DEBUG_M_V6_1: /* fall through */<= br> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cp14_dbgdscr_v6_set(d= bg_dscr | DBGSCR_MDBG_EN);
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;

Should this function also be removed?=C2=A0 Looks to be defined here in sys= /arm/include/cpu.h:

_WF1(cp14_dbgdscr_v6_set, CP14_DBGDSCRext_V6(%0))

=
OK. I'll do these tweaks..

Warner
=C2=A0
--0000000000003d9f6a06450575a8-- From nobody Wed Dec 3 05:32:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLmVM2Jh5z6HfcW for ; Wed, 03 Dec 2025 05:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLmVM1nQJz3Dhv for ; Wed, 03 Dec 2025 05:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764739931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHCB8tGVNHvDfO0jv5xrz3FP5MqH1yzeILvXvp/kkMY=; b=ZTcJY/2Cj9OpOLIuthJgWNoNY/HAeiwy6qbHa/aCNE4G/afnFRVnFmLZZrd82hcidXQIBT c7RcUi/LXb1ad30BLmyWvdoZdc70EOvY3jZQ1jAPmjpeCsIz0s9SOwzetBgkVnsvLj1DHW tJVRjBePOSKGTHiMvGEMWL0IGor4Vg0vreBRlfwCXH0x+1YCKr4w3rXC0y7F2DvGnKqb7J Nx6hi3f4lKc7P7fgA5Yhwvr74rKq4qyveSYGQYGmmk4jygZOGScFV9vnxVMxe621mqxw8d C8Rj2WElcNiW11PAWyYYf+c39bWfSdos/Nt6QFThGaRbG7jNa9tUq4Z2MTWWMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764739931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHCB8tGVNHvDfO0jv5xrz3FP5MqH1yzeILvXvp/kkMY=; b=PQ/K4Yi6kOBGbYnQtyejr/IbUumiCUYEm91ZNyXTA+3h0ozxB7P+tjqlRz0A8O1c3CkPax Gau/yOCNvZbUu41Pq3rcBvQxt9N+b9gul28OvVJtQBK6kgHyjNd9I66kuWqSkEwcxp13Iw isYxwlpwFIm1ZpwvHNL5PcB/3BwsX6oXkaoddZ6CzFb0hrpcGW7DiFv8G771JU8P77F/fF OHxkxUqjDO7ZTYK9Y0RUAHkqzi2pptDecMZsd7lj/L2ZRmJfpUF7MREizb+6kA/Zga0f7g YpIGywnPyTv7KvV6RTjnrqUS/1A1l2dFCXfAZwUfP/qJ5DMvP+UM6oe7gRsUxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764739931; a=rsa-sha256; cv=none; b=W0Wp/PD0ijhAfym0NMSXgZR/1g/u61yG7ovdv6Y0jype6xRLth4KSN8j+EK4Nsq8z/gasp nNBd2foTDvOSJowFTH3XujnLy7qgrOpGm1tA/NwqcBa/qwWYZx7ouvg5WmO9lx17qb+ue9 9pzHYN8nSLQ1DSFP3doXmVcJio3dlf97U3EvRpp5U7IlzmFZaLiqmR31+eQ8qdFvqovYaE kW98MadP+pdsWwXAUBtTfCimPzx8Wvb8e+na22Yt0i8homOHFsdJtFXnVwLNC3nNxPxFrH /YTAIuLX68UUuH7bmLpe0pp/wpA9qkLSIVuqUGkCFCqgFHTJ/D52eG0iZmbeAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLmVM1FkBz8LB for ; Wed, 03 Dec 2025 05:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8ec2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 05:32:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b033e3684fd1 - main - armv7: Tweak some armv6 removals List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b033e3684fd14c798405420449eb55e1d4f9df1e Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 05:32:11 +0000 Message-Id: <692fcb5b.8ec2.4d508639@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b033e3684fd14c798405420449eb55e1d4f9df1e commit b033e3684fd14c798405420449eb55e1d4f9df1e Author: Warner Losh AuthorDate: 2025-12-03 05:29:42 +0000 Commit: Warner Losh CommitDate: 2025-12-03 05:29:42 +0000 armv7: Tweak some armv6 removals Fixes: 42421307b115 (sys: remove armv6/6.1 support from debug monitor) Suggested by: jhb Sponsored by: Netflix --- sys/arm/arm/debug_monitor.c | 2 ++ sys/arm/include/cpu.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm/arm/debug_monitor.c b/sys/arm/arm/debug_monitor.c index a703c65f541b..9c5ee85e2925 100644 --- a/sys/arm/arm/debug_monitor.c +++ b/sys/arm/arm/debug_monitor.c @@ -83,6 +83,8 @@ static uint32_t dbg_breakpoint_num; #define ID_DFR0_CP_DEBUG_M_SHIFT 0 #define ID_DFR0_CP_DEBUG_M_MASK (0xF << ID_DFR0_CP_DEBUG_M_SHIFT) #define ID_DFR0_CP_DEBUG_M_NS (0x0) /* Not supported */ +#define ID_DFR0_CP_DEBUG_M_V6 (0x2) /* v6 Debug arch. CP14 access */ +#define ID_DFR0_CP_DEBUG_M_V6_1 (0x3) /* v6.1 Debug arch. CP14 access */ #define ID_DFR0_CP_DEBUG_M_V7 (0x4) /* v7 Debug arch. CP14 access */ #define ID_DFR0_CP_DEBUG_M_V7_1 (0x5) /* v7.1 Debug arch. CP14 access */ diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h index da8127b093f0..d13e0d81db5b 100644 --- a/sys/arm/include/cpu.h +++ b/sys/arm/include/cpu.h @@ -186,7 +186,6 @@ _RF0(cp14_dbgoslsr_get, CP14_DBGOSLSR(%0)) _RF0(cp14_dbgosdlr_get, CP14_DBGOSDLR(%0)) _RF0(cp14_dbgdscrint_get, CP14_DBGDSCRint(%0)) -_WF1(cp14_dbgdscr_v6_set, CP14_DBGDSCRext_V6(%0)) _WF1(cp14_dbgdscr_v7_set, CP14_DBGDSCRext_V7(%0)) _WF1(cp14_dbgvcr_set, CP14_DBGVCR(%0)) _WF1(cp14_dbgoslar_set, CP14_DBGOSLAR(%0)) From nobody Wed Dec 3 06:51:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLpGQ4hBCz6HmTJ for ; Wed, 03 Dec 2025 06: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLpGQ3ndnz3Q6s for ; Wed, 03 Dec 2025 06: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=1764744718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZB5YdKGX5MCSHUsp8D47vBL711ofLy0QBJdA17LL2xg=; b=QV9zxbInOOKRRPDVDXKL1u3Y3ZplwnOUnj374nZSlGk2OiJXGCnZa9whY+rK+cfOfmk4Lu 3oPOKK646DV8RJR+3ALSSjtbJJxrmxsGRBYrWvCIGqmqScZK6CYoRIj9jv2x6Ej5WlCBwv ii51Xak1mcicTEAELwaSvIsLJWfX4wh4uF4PqO5xYNhSEhYm38RL9fExtDQmaI8wu0OPSV OLDCCjCcfep8VHG1UAsqEpFhsgAjc20/pUY6+k8GFvWfc62Y26pHwwA52du6Pom7dgdh0k nB+WxX99zBLJb/1sTk7RBfIqv0QzuPYXg4DOJ00xYB2Qo6lt/DrnhhQe1xqiZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764744718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZB5YdKGX5MCSHUsp8D47vBL711ofLy0QBJdA17LL2xg=; b=xv9v/hoeii5YQGHxeNLI+dsDZk47UFRgmT9j6OnhBnB3JRzYjkfkO2J+DjlrAoGOlEwZDq yI9ap4KJioV9x/qJ5OaTAhQaTfmnqc+IWFvEwzeIRbMWSuq3KCbwIKlm1IbnE1LZ4HogMI I+oQGh40pEOPwOKj/PiU02jL6tgFFRGbmiasOjJSEJ688lA4a9vWtA7gZYMGJp9OIE8aj8 GGNLDp8JetD/RDlmYuAc+6Nm8+rx0XlC64raYP/eSVQqzDMbv48KraxDchkkWL5TG4H7aG neD0IHW7wJweD22xUPjxb1Q2bQDr5cY/mTfdmglA6HwTa+SBqASjaFquAfLuxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764744718; a=rsa-sha256; cv=none; b=cJP/AeS8Xer76pz60y5ioy+GognVSTZTTjVIDsqjIOo0NwovMzActBlyauuFaizKTc1h7F 2GOe84C8P1YQVJIeO7akWRpxJoK1oopTQZbDpdx1f9eNqlct+IUKwWdoGblz7zfww5u8Bk g0fKCvSaFAk2WndnHB4r8CQTheLJi7wdIx2PTzGnlysYxZDMqkixjzV7vdkcAlgPVKbf71 YTt1tcYLB/nXc6wsvO5kEZ1ngwmd9oLDtwnjcjPtWMgI0TDQWqcNYRl0JxEHZH/Y7/q0/z ulQs0fdSMmMQTJYvHcSMHqafhZwtKo4l2tGJ3pOLKXhgU7L9OJQGjl1t2PrrTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLpGQ3BGDzBQm for ; Wed, 03 Dec 2025 06:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d76 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 06:51:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: d14a985898ee - main - ofw: Add ofw_bus_is_machine_compat(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d14a985898eebd3bda8bb30c4078bde3ebd135f2 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 06:51:58 +0000 Message-Id: <692fde0e.22d76.185bc98a@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=d14a985898eebd3bda8bb30c4078bde3ebd135f2 commit d14a985898eebd3bda8bb30c4078bde3ebd135f2 Author: Michal Meloun AuthorDate: 2025-11-06 18:50:52 +0000 Commit: Michal Meloun CommitDate: 2025-12-03 06:47:41 +0000 ofw: Add ofw_bus_is_machine_compat(). We need a quick way to identify a given machine (SoC), mainly when implementing quirks for a given SoC. MFC after: 2 weeks Reviwed by: imp Differential Revision: https://reviews.freebsd.org/D53992 --- sys/dev/ofw/ofw_bus_subr.c | 9 +++++++++ sys/dev/ofw/ofw_bus_subr.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/sys/dev/ofw/ofw_bus_subr.c b/sys/dev/ofw/ofw_bus_subr.c index b99d784929bc..efca3ea14e2f 100644 --- a/sys/dev/ofw/ofw_bus_subr.c +++ b/sys/dev/ofw/ofw_bus_subr.c @@ -298,6 +298,15 @@ ofw_bus_is_compatible_strict(device_t dev, const char *compatible) return (0); } +bool +ofw_bus_is_machine_compatible(const char *compat) +{ + phandle_t root; + + root = OF_finddevice("/"); + return (ofw_bus_node_is_compatible(root, compat) != 0); +} + const struct ofw_compat_data * ofw_bus_search_compatible(device_t dev, const struct ofw_compat_data *compat) { diff --git a/sys/dev/ofw/ofw_bus_subr.h b/sys/dev/ofw/ofw_bus_subr.h index 1a33d7655f77..203c9689f156 100644 --- a/sys/dev/ofw/ofw_bus_subr.h +++ b/sys/dev/ofw/ofw_bus_subr.h @@ -117,6 +117,9 @@ int ofw_bus_is_compatible(device_t, const char *); int ofw_bus_is_compatible_strict(device_t, const char *); int ofw_bus_node_is_compatible(phandle_t, const char *); +/* Check if machine (root node) is compatible */ +bool ofw_bus_is_machine_compatible(const char *); + /* * Helper routine to search a list of compat properties. The table is * terminated by an entry with a NULL compat-string pointer; a pointer to that From nobody Wed Dec 3 06:51:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLpGR5pz2z6HmhB for ; Wed, 03 Dec 2025 06:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLpGR5K3Wz3QJ5 for ; Wed, 03 Dec 2025 06:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764744719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WaQYbNAB4X65qMNwAtJsJrtpQ6rP9W+J+3I+z5C+6YY=; b=OXK/hejiTIqKpWKJXTFuYhCHbvgE6ddBGk8tMo886nRn+08DWL32h/4NQiy3fEQTiVDjks PbMLPeF6VXvHRKFqLrcNTQ/mgdbC8PpJDoyGXMu0ymoizDOe/otzrWFa98X1WnOIc7iIpH CYxNcpLMYazhfNZFHmbkSEalPPn8AJoB+TC+mqigwlzdXv4R6BEs2cZYqRb0w68jzTl8VO i9ikawSgQl6S9xbqonRhtnCDfWsZbLmonslKO9SygcTRXcVXHVAK2jreZ5QYeLcF0YIhD5 cW7PywIxUhhjHTqqKOXe0K9zt001D+f3PnHHtZahGMp/LnXercbxZ5cYOeNb9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764744719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WaQYbNAB4X65qMNwAtJsJrtpQ6rP9W+J+3I+z5C+6YY=; b=jP42FB/pnw6HDo1s8QLHcfxqV4kjpYGqkbI2Ycli7qmuAHcht8T5zrJPRnsyxUnR+3lHjw 8U0xW4NiMn9pxo6xAswWFOkgJvF1Asr9ZD6y8LP7UEpXV1WSHceeeEpKU6Src4nqhoa8Ks 3wSHjjP51PtH3dfy/yXWRGSrR4WrnkEM1v+O1epxW99FWvz2g+u/GZI2Nl0WCjqqfiFORH 3cr8kvTLvr2wSROoX+boiNDtW/Sb8FN4kVu2CHuiljBNgNBmdl6Vo7ZZS2FTz7WJsH6toA z71u+mUfMr5fC/aAZTxDGV90j6M3FVedXng7ndTsKd58t2yAZ16gnc2Sk0h3xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764744719; a=rsa-sha256; cv=none; b=Sat7BmoCKjazV7RfT0S79JSn8W76maAXMkHEpLFJwKS8VD9GQadh9kgXRxs4kZsO2O4aoV IGp7cUB5GsHA+2w8R4m5jN/DNTcckbxM3+YaNvy+PkAXP2c+CSsI2DCCPBtf/aBYbt8Y0K m/kqE3jLBq5l2UHAzi1rNmc09CG7GFwSv/6A5qbovgoZ0IJj+sVxMy1/J0bBsDLdo1ePNd OfQYkC5czQj/C/+YKzf0Flno17s0v+GBZf4vbFIrEE3hTwi0CtXEqnGTZott0ed5eztKJf 7Tpp1m2BWLadkdBIpQMEf6rhC6Qw3UlBCcOcnEfUFrDBV10JNUAKbP96JXJx0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLpGR3lSfzBQn for ; Wed, 03 Dec 2025 06:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 06:51:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 62e1227219f2 - main - ARM GICv3: Add support for non-coherent and/or bus address range limited DMA. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62e1227219f2f79a2ed7a672149dc3d774d25dd4 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 06:51:59 +0000 Message-Id: <692fde0f.22e21.6b96ab5b@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=62e1227219f2f79a2ed7a672149dc3d774d25dd4 commit 62e1227219f2f79a2ed7a672149dc3d774d25dd4 Author: Michal Meloun AuthorDate: 2025-11-06 18:56:10 +0000 Commit: Michal Meloun CommitDate: 2025-12-03 06:47:41 +0000 ARM GICv3: Add support for non-coherent and/or bus address range limited DMA. Due to an implementation bug, the GICv3 and ITS master ports may be connected to a non-coherent bus. The new DT resolves this issue by marking these ports with the "dma-nocoherent" attribute. The older DT does not have this attribute, so we must match the affected SoC. Additionally, the RK356x family has GIC master ports on a 32-bit bus. Therefore, we must limit the address range for all tables and command buffers allocated for it. In this case, the DT does not have an attribute for this case, so the quirk should only be applied by SoC matching. MFC after: 4 weeks Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47488 --- sys/arm64/arm64/gic_v3.c | 4 ++ sys/arm64/arm64/gic_v3_fdt.c | 15 ++++- sys/arm64/arm64/gic_v3_var.h | 6 ++ sys/arm64/arm64/gicv3_its.c | 156 ++++++++++++++++++++++++++++++++++++------- 4 files changed, 157 insertions(+), 24 deletions(-) diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index 641b6d6dbc5e..d74cdc20dd20 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -494,6 +494,9 @@ gic_v3_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) case GICV3_IVAR_REDIST: *result = (uintptr_t)&sc->gic_redists.pcpu[PCPU_GET(cpuid)]; return (0); + case GICV3_IVAR_FLAGS: + *result = sc->gic_flags; + return (0); case GIC_IVAR_SUPPORT_LPIS: *result = (gic_d_read(sc, 4, GICD_TYPER) & GICD_TYPER_LPIS) != 0; @@ -530,6 +533,7 @@ gic_v3_write_ivar(device_t dev, device_t child, int which, uintptr_t value) switch(which) { case GICV3_IVAR_NIRQS: case GICV3_IVAR_REDIST: + case GICV3_IVAR_FLAGS: case GIC_IVAR_HW_REV: case GIC_IVAR_BUS: return (EINVAL); diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c index 4bea4040c0ba..871516145168 100644 --- a/sys/arm64/arm64/gic_v3_fdt.c +++ b/sys/arm64/arm64/gic_v3_fdt.c @@ -110,7 +110,7 @@ gic_v3_fdt_attach(device_t dev) { struct gic_v3_softc *sc; pcell_t redist_regions; - intptr_t xref; + phandle_t xref, node; int err; uint32_t *mbi_ranges; ssize_t ret; @@ -118,6 +118,19 @@ gic_v3_fdt_attach(device_t dev) sc = device_get_softc(dev); sc->dev = dev; sc->gic_bus = GIC_BUS_FDT; + node = ofw_bus_get_node(dev); + + /* + * Limit DMA shareability. "dma-noncoherent" was introduced in DT 6.15. + * For compatibility with previous versions, also use a match based on + * affected SoCs. + */ + if (OF_hasprop(node, "dma-noncoherent") || + ofw_bus_is_machine_compatible("rockchip,rk3566") || + ofw_bus_is_machine_compatible("rockchip,rk3568") || + ofw_bus_is_machine_compatible("rockchip,rk3588") || + ofw_bus_is_machine_compatible("rockchip,rk3588s")) + sc->gic_flags |= GIC_V3_FLAGS_FORCE_NOSHAREABLE; /* * Recover number of the Re-Distributor regions. diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 2570834c2818..a490b69b7417 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -63,6 +63,8 @@ struct gic_redists { struct redist_pcpu *pcpu; }; +#define GIC_V3_FLAGS_FORCE_NOSHAREABLE 0x0000001 + struct gic_v3_softc { device_t dev; struct resource ** gic_res; @@ -92,6 +94,8 @@ struct gic_v3_softc { int nranges; struct arm_gic_range * ranges; + + uint32_t gic_flags; }; struct gic_v3_devinfo { @@ -108,9 +112,11 @@ MALLOC_DECLARE(M_GIC_V3); #define GICV3_IVAR_NIRQS 1000 /* 1001 was GICV3_IVAR_REDIST_VADDR */ #define GICV3_IVAR_REDIST 1002 +#define GICV3_IVAR_FLAGS 1003 __BUS_ACCESSOR(gicv3, nirqs, GICV3, NIRQS, u_int); __BUS_ACCESSOR(gicv3, redist, GICV3, REDIST, void *); +__BUS_ACCESSOR(gicv3, flags, GICV3, FLAGS, uint32_t); /* Device methods */ int gic_v3_attach(device_t dev); diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 7821b1512083..06491f6ffe05 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -287,28 +287,50 @@ struct gicv3_its_softc { #define ITS_FLAGS_LPI_CONF_FLUSH 0x00000002 #define ITS_FLAGS_ERRATA_CAVIUM_22375 0x00000004 #define ITS_FLAGS_LPI_PREALLOC 0x00000008 +#define ITS_FLAGS_FORCE_NOSHAREABLE 0x00000010 u_int sc_its_flags; bool trace_enable; vm_page_t ma; /* fake msi page */ + vm_paddr_t malloc_max_addr; /* max address for contigmalloc */ }; +typedef bool (its_quirk_detect_t)(device_t); typedef void (its_quirk_func_t)(device_t); -static its_quirk_func_t its_quirk_cavium_22375; + +static its_quirk_detect_t its_detect_cavium_22375; +static its_quirk_func_t its_quirk_cavium_22375; +#ifdef FDT +static its_quirk_detect_t its_detect_rk356x; +static its_quirk_func_t its_quirk_rk356x; +static its_quirk_detect_t its_detect_rk3588; +static its_quirk_func_t its_quirk_rk3588; +#endif static const struct { const char *desc; - uint32_t iidr; - uint32_t iidr_mask; + its_quirk_detect_t *detect; its_quirk_func_t *func; } its_quirks[] = { { /* Cavium ThunderX Pass 1.x */ .desc = "Cavium ThunderX errata: 22375, 24313", - .iidr = GITS_IIDR_RAW(GITS_IIDR_IMPL_CAVIUM, - GITS_IIDR_PROD_THUNDER, GITS_IIDR_VAR_THUNDER_1, 0), - .iidr_mask = ~GITS_IIDR_REVISION_MASK, + .detect = its_detect_cavium_22375, .func = its_quirk_cavium_22375, }, +#ifdef FDT + { + /* Rockchip RK356X implementation bugs */ + .desc = "RK356X ITS errata", + .detect = its_detect_rk356x, + .func = its_quirk_rk356x, + }, + { + /* Rockchip RK3588 implementation bugs */ + .desc = "RK3588 ITS errata", + .detect = its_detect_rk3588, + .func = its_quirk_rk3588, + }, +#endif }; #define gic_its_read_4(sc, reg) \ @@ -387,6 +409,13 @@ static device_method_t gicv3_its_methods[] = { static DEFINE_CLASS_0(gic, gicv3_its_driver, gicv3_its_methods, sizeof(struct gicv3_its_softc)); +/* Limit maximum address for memory mapped tables and buffers */ +static vm_paddr_t +gicv3_its_limit_max_addr(struct gicv3_its_softc *sc, vm_paddr_t addr) +{ + return (sc->malloc_max_addr > addr ? addr: sc->malloc_max_addr); +} + static void gicv3_its_cmdq_init(struct gicv3_its_softc *sc) { @@ -395,7 +424,8 @@ gicv3_its_cmdq_init(struct gicv3_its_softc *sc) /* Set up the command circular buffer */ sc->sc_its_cmd_base = contigmalloc_domainset(ITS_CMDQ_SIZE, M_GICV3_ITS, - sc->sc_ds, M_WAITOK | M_ZERO, 0, (1ul << 48) - 1, ITS_CMDQ_ALIGN, + sc->sc_ds, M_WAITOK | M_ZERO, 0, + gicv3_its_limit_max_addr(sc, (1ul << 48) - 1), ITS_CMDQ_ALIGN, 0); sc->sc_its_cmd_next_idx = 0; @@ -404,8 +434,11 @@ gicv3_its_cmdq_init(struct gicv3_its_softc *sc) /* Set the base of the command buffer */ reg = GITS_CBASER_VALID | (GITS_CBASER_CACHE_NIWAWB << GITS_CBASER_CACHE_SHIFT) | - cmd_paddr | (GITS_CBASER_SHARE_IS << GITS_CBASER_SHARE_SHIFT) | - (ITS_CMDQ_SIZE / 4096 - 1); + cmd_paddr | (ITS_CMDQ_SIZE / 4096 - 1); + if (sc->sc_its_flags & ITS_FLAGS_FORCE_NOSHAREABLE) + reg |= GITS_CBASER_SHARE_NS << GITS_CBASER_SHARE_SHIFT; + else + reg |= GITS_CBASER_SHARE_IS << GITS_CBASER_SHARE_SHIFT; gic_its_write_8(sc, GITS_CBASER, reg); /* Read back to check for fixed value fields */ @@ -532,10 +565,17 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) cache = 0; } else { devbits = GITS_TYPER_DEVB(gic_its_read_8(sc, GITS_TYPER)); - cache = GITS_BASER_CACHE_RAWAWB; + if (sc->sc_its_flags & ITS_FLAGS_FORCE_NOSHAREABLE) + cache = GITS_BASER_CACHE_NC; + else + cache = GITS_BASER_CACHE_RAWAWB; } sc->sc_devbits = devbits; - share = GITS_BASER_SHARE_IS; + + if (sc->sc_its_flags & ITS_FLAGS_FORCE_NOSHAREABLE) + share = GITS_BASER_SHARE_NS; + else + share = GITS_BASER_SHARE_IS; for (i = 0; i < GITS_BASER_NUM; i++) { reg = gic_its_read_8(sc, GITS_BASER(i)); @@ -611,7 +651,8 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) /* Allocate the table */ table = contigmalloc_domainset(npages * PAGE_SIZE, M_GICV3_ITS, sc->sc_ds, M_WAITOK | M_ZERO, 0, - (1ul << 48) - 1, PAGE_SIZE_64K, 0); + gicv3_its_limit_max_addr(sc, (1ul << 48) - 1), + PAGE_SIZE_64K, 0); sc->sc_its_ptab[i].ptab_vaddr = table; sc->sc_its_ptab[i].ptab_l1_size = its_tbl_size; @@ -741,7 +782,8 @@ gicv3_its_conftable_init(struct gicv3_its_softc *sc) * PROPBASER register later in its_init_cpu_lpi(). */ conf_table = contigmalloc(LPI_CONFTAB_SIZE, - M_GICV3_ITS, M_WAITOK, 0, LPI_CONFTAB_MAX_ADDR, + M_GICV3_ITS, M_WAITOK, 0, + gicv3_its_limit_max_addr(sc, LPI_CONFTAB_MAX_ADDR), LPI_CONFTAB_ALIGN, 0); } sc->sc_conf_base = conf_table; @@ -766,7 +808,9 @@ gicv3_its_pendtables_init(struct gicv3_its_softc *sc) sc->sc_pend_base[i] = contigmalloc( LPI_PENDTAB_SIZE, M_GICV3_ITS, M_WAITOK | M_ZERO, - 0, LPI_PENDTAB_MAX_ADDR, LPI_PENDTAB_ALIGN, 0); + 0, + gicv3_its_limit_max_addr(sc, LPI_PENDTAB_MAX_ADDR), + LPI_PENDTAB_ALIGN, 0); /* Flush so the ITS can see the memory */ cpu_dcache_wb_range(sc->sc_pend_base[i], @@ -804,10 +848,12 @@ its_init_cpu_lpi(device_t dev, struct gicv3_its_softc *sc) size = ilog2_long(LPI_CONFTAB_SIZE | GIC_FIRST_LPI) - 1; xbaser = vtophys(sc->sc_conf_base) | - (GICR_PROPBASER_SHARE_IS << GICR_PROPBASER_SHARE_SHIFT) | (GICR_PROPBASER_CACHE_NIWAWB << GICR_PROPBASER_CACHE_SHIFT) | size; - + if (gicv3_get_flags(sc->dev) & GIC_V3_FLAGS_FORCE_NOSHAREABLE) + xbaser |= GICR_PROPBASER_SHARE_NS << GICR_PROPBASER_SHARE_SHIFT; + else + xbaser |= GICR_PROPBASER_SHARE_IS << GICR_PROPBASER_SHARE_SHIFT; gic_r_write_8(gicv3, GICR_PROPBASER, xbaser); /* Check the cache attributes we set */ @@ -835,8 +881,11 @@ its_init_cpu_lpi(device_t dev, struct gicv3_its_softc *sc) * Set the LPI pending table base */ xbaser = vtophys(sc->sc_pend_base[cpuid]) | - (GICR_PENDBASER_CACHE_NIWAWB << GICR_PENDBASER_CACHE_SHIFT) | - (GICR_PENDBASER_SHARE_IS << GICR_PENDBASER_SHARE_SHIFT); + (GICR_PENDBASER_CACHE_NIWAWB << GICR_PENDBASER_CACHE_SHIFT); + if (sc->sc_its_flags & ITS_FLAGS_FORCE_NOSHAREABLE) + xbaser |= GITS_CBASER_SHARE_NS << GITS_CBASER_SHARE_SHIFT; + else + xbaser |= GITS_CBASER_SHARE_IS << GITS_CBASER_SHARE_SHIFT; gic_r_write_8(gicv3, GICR_PENDBASER, xbaser); @@ -1017,6 +1066,7 @@ gicv3_its_attach(device_t dev) sc->sc_irq_length = gicv3_get_nirqs(dev); sc->sc_irq_base = GIC_FIRST_LPI; sc->sc_irq_base += device_get_unit(dev) * sc->sc_irq_length; + sc->malloc_max_addr = ~0; rid = 0; sc->sc_its_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, @@ -1034,7 +1084,7 @@ gicv3_its_attach(device_t dev) CPU_COPY(&all_cpus, &sc->sc_cpus); iidr = gic_its_read_4(sc, GITS_IIDR); for (i = 0; i < nitems(its_quirks); i++) { - if ((iidr & its_quirks[i].iidr_mask) == its_quirks[i].iidr) { + if (its_quirks[i].detect(dev)) { if (bootverbose) { device_printf(dev, "Applying %s\n", its_quirks[i].desc); @@ -1128,6 +1178,21 @@ gicv3_its_detach(device_t dev) return (ENXIO); } +static bool +its_detect_cavium_22375(device_t dev) +{ + uint32_t iidr; + struct gicv3_its_softc *sc; + + sc = device_get_softc(dev); + iidr = gic_its_read_4(sc, GITS_IIDR); + if ((iidr & ~GITS_IIDR_REVISION_MASK) == + GITS_IIDR_RAW(GITS_IIDR_IMPL_CAVIUM, GITS_IIDR_PROD_THUNDER, + GITS_IIDR_VAR_THUNDER_1, 0)) + return (true); + return(false); +} + static void its_quirk_cavium_22375(device_t dev) { @@ -1151,6 +1216,46 @@ its_quirk_cavium_22375(device_t dev) } } +#ifdef FDT +static bool +its_detect_rk356x(device_t dev) +{ + + if (ofw_bus_is_machine_compatible("rockchip,rk3566") || + ofw_bus_is_machine_compatible("rockchip,rk3568")) + return (true); + return(false); +} + +static void +its_quirk_rk356x(device_t dev) +{ + struct gicv3_its_softc *sc; + + sc = device_get_softc(dev); + sc->malloc_max_addr = (1ul << 32) - 1; +} + +static bool +its_detect_rk3588(device_t dev) +{ + + if (ofw_bus_is_machine_compatible("rockchip,rk3588") || + ofw_bus_is_machine_compatible("rockchip,rk3588s")) + return (true); + return(false); +} + +static void +its_quirk_rk3588(device_t dev) +{ + struct gicv3_its_softc *sc; + + sc = device_get_softc(dev); + sc->sc_its_flags |= ITS_FLAGS_FORCE_NOSHAREABLE; +} +#endif + static void gicv3_its_disable_intr(device_t dev, struct intr_irqsrc *isrc) { @@ -1400,7 +1505,8 @@ its_device_alloc(struct gicv3_its_softc *sc, int devid) shareable = false; l2_table = contigmalloc_domainset(ptable->ptab_l2_size, - M_GICV3_ITS, sc->sc_ds, M_WAITOK | M_ZERO, 0, (1ul << 48) - 1, + M_GICV3_ITS, sc->sc_ds, M_WAITOK | M_ZERO, 0, + gicv3_its_limit_max_addr(sc, (1ul << 48) - 1), ptable->ptab_page_size, 0); if (!shareable) @@ -1461,7 +1567,8 @@ its_device_get(device_t dev, device_t child, u_int nvecs) itt_size = roundup2(MAX(nvecs, 2) * esize, 256); its_dev->itt = contigmalloc_domainset(itt_size, M_GICV3_ITS, sc->sc_ds, M_NOWAIT | M_ZERO, 0, - LPI_INT_TRANS_TAB_MAX_ADDR, LPI_INT_TRANS_TAB_ALIGN, 0); + gicv3_its_limit_max_addr(sc, LPI_INT_TRANS_TAB_MAX_ADDR), + LPI_INT_TRANS_TAB_ALIGN, 0); if (its_dev->itt == NULL) { vmem_free(sc->sc_irq_alloc, its_dev->lpis.lpi_base, nvecs); free(its_dev, M_GICV3_ITS); @@ -2233,17 +2340,20 @@ static int gicv3_its_fdt_attach(device_t dev) { struct gicv3_its_softc *sc; - phandle_t xref; + phandle_t xref, node; int err; sc = device_get_softc(dev); sc->dev = dev; + node = ofw_bus_get_node(dev); err = gicv3_its_attach(dev); if (err != 0) return (err); + if (OF_hasprop(node, "dma-noncoherent")) + sc->sc_its_flags |= ITS_FLAGS_FORCE_NOSHAREABLE; /* Register this device as a interrupt controller */ - xref = OF_xref_from_node(ofw_bus_get_node(dev)); + xref = OF_xref_from_node(node); sc->sc_pic = intr_pic_register(dev, xref); err = intr_pic_add_handler(device_get_parent(dev), sc->sc_pic, gicv3_its_intr, sc, sc->sc_irq_base, sc->sc_irq_length); From nobody Wed Dec 3 06:52:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLpGT1Q7rz6Hmcg for ; Wed, 03 Dec 2025 06:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLpGS64Ljz3QWS for ; Wed, 03 Dec 2025 06:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764744720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QbfS4EEtpl8yzqhc1+Bpbq44k9k3ivGPWMtlw577SuQ=; b=dSXyVUmlhpSZiZXuh2GaZO6HWvNkcuumNBObklDWrDooOKiAGR+wgcqKg4bRgD3hYtISl8 1UTPE5ffCLL3jXUc9jlTNPUUTQuMKeAOxpbfNJlRdURFhRe2t0qUjrDYyDjq3NTzK05jhD 4Cje9KA/sGwdaHagLZv77c+M8svuFHokasXrxvZRH6NZLktepvpkxBHPt4ER/VwT2WZSVo AQnYReGdl83BiZnfoge8vBE2VrANLkYStL3gFBOlOWbbP8nKT0OqBmE5+lqicwM54g76Q9 60lg+DXz6jyiq0mqVMudUx87kwycakbJfwn8vCjv/Y+ZpzVANjOv1WHfsL1H+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764744720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QbfS4EEtpl8yzqhc1+Bpbq44k9k3ivGPWMtlw577SuQ=; b=SLGcAFFutjc8Eqs8LQQdLB9QO+outSFXfcX2qh6VOR5YlFLjkBgknkLYkI6MmoAlZPQ0wq UASHUxpkNRASGkv4SFrWH0a/1VBA4EvbHoab9RqCW2411HwPcxNcf5t/JpWBtvMwxqqjm7 N7n19uyu2cTLICNJgKm2BJG5SUt4qysMFy1MSLpYb+77acv5tqsP9YMsIhOJYPkjpXgGQa t6Kj9Ain0uVCzpRVQ2oVOK5lzKBZYyMV73kmYgrd684KltIV3i0V4UI6moiFnMCGFUKiyb U9d8MbMElQVJXJAUTDvpCjjlBosH1pXe7s0oAE6Q9ZHcSsRHV87NsGZksn4C4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764744720; a=rsa-sha256; cv=none; b=ABTGiVBWU5f9zUr6XafouUXlSSajrUM2MmnBc72BHOOWKzKW4y/FgujRustCikK9BSuY/n MwHE1CS912tGfSfZflrR35W9hZ8QVBel7lyxBWFti2N906OrcTJfacujCnaYsHntCOb+Qd 5DblDm0kH/sZQFQlda42n41by2jBFJGT0K5cBftgHBBwSYcjFzMdpXROJFMA2GWCSucqSY 1GSeruebP+qRYYVkmfmYfal1KG4hd5OOAFmV7bqgQkWqiwfP1d5z/BvzC0YE/dAgAK8tU+ CDO9LOOG02FNkriFavbLXtnKoh9sWE2XLSuH3343eRr/HihvJq2bB2lE2a9N0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLpGS4WNbzBQp for ; Wed, 03 Dec 2025 06:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 237b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 06:52:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: 3e7d3361dd24 - main - arm64: Add missing dtrace_isa.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e7d3361dd2491e2dc4b0b05c09b8fab4beaadc5 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 06:52:00 +0000 Message-Id: <692fde10.237b9.4c59104@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=3e7d3361dd2491e2dc4b0b05c09b8fab4beaadc5 commit 3e7d3361dd2491e2dc4b0b05c09b8fab4beaadc5 Author: Michal Meloun AuthorDate: 2025-11-08 14:02:47 +0000 Commit: Michal Meloun CommitDate: 2025-12-03 06:47:41 +0000 arm64: Add missing dtrace_isa.c MFC after: 1 week --- sys/conf/files.arm64 | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 886980de754b..4bd03989afa0 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -208,6 +208,7 @@ dev/acpica/acpi_pxm.c optional acpi dev/ahci/ahci_generic.c optional ahci cddl/dev/dtrace/aarch64/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}" +cddl/dev/dtrace/aarch64/dtrace_isa.c optional dtrace compile-with "${DTRACE_C}" cddl/dev/dtrace/aarch64/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}" cddl/dev/fbt/aarch64/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}" From nobody Wed Dec 3 06:52:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLpGV1WbCz6HmhF for ; Wed, 03 Dec 2025 06:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLpGT5SyLz3QNd for ; Wed, 03 Dec 2025 06:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764744721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VMtO/kaFH09E0bh8FUwVd0qp4wJ9cXAhFg7m696AalA=; b=opkejJeGwH457UPnmqaSrjiEz67WGaOJVmcGKIPLQlTZqY9b571+VOZfGQaJjtnAhZ4jqR Qci2ydni+WxkZijfPtsLN2wUdHpRsqHNAEyPjDv8JnLYwd7eRxSMu0r5tZ2JVLdB0sLxhf Rvdw0Xn1iRxWtJdBzthpytpAKYyMnhYFPMxGYIDxnrj7+oxrRek6hoBiHOoshdKiwo3c5Y uoCvDw7e5Yh30iDe1d8+Lt509sZNxPHbOmPjfraF8QZ5hzGKKZQxvMAZix4wXg46/rYpjP tIFM3NwoGuR+pGo7RdQlostZITkdxj/DqCcghmk3UFUib2HPCM1OQRY18byksA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764744721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VMtO/kaFH09E0bh8FUwVd0qp4wJ9cXAhFg7m696AalA=; b=obDTD2oq+1mAUoDy/yzm6qReDLIrTzyTDtah2HkKJMMs74C+WROMiuC86FQM05eJX+er7F 1zz/4J1U9GjkV+WzXtVd3gQzil83TAQP4Gpa5LpOZT+Robfx88oDPj5Rx+iCVsTek8V0dB /lL0oeae+NVYbGKIx85+4AGSgfR6bA9hMyNmZ2DR79K51f8wYRiObCU5crMX3bfYkE2wjR dgpNjTCfZdJ6XttXFv7NSG2GfipalD0dBhvwZMnh3EBtSBd7+FSiZGlBQcoZyswsn/KrQc G+/mcQ9qe9GT7qvcgj7gaD6a6oQPwk3ayvpcL3VKivPslKBfXMiJmgFj1FbM9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764744721; a=rsa-sha256; cv=none; b=FMu25gdf2J01uC8qSX6Ei5XilnuvaMKVBcPyoBrBAK8GycNaS4hglcSYDJCkeOlkfSThFx 8WyHLdWQBLlVij8J4ycUSZwrdgjKqTe3w5sVwf3fP87F5H8BYfToVOi5KU2zvf+FjXvJuU lIq/y3BXW0uFzN21Z6TDFxKFK+bjHweDbV32yLiwFPN89aaP+cg8lOsRn4RuAj+j0LBi4o YaP6VKNBroZtphhmTvO48j2u3Yt8ez6pCs6vwhId0B79Uf8VJ/MPpEUiqW2CBzi01e8v3y E9oEMLWafaXdwFdxdPPjzujKABSCcTIpPHLR0b4sxagtd4QGArE5XeqRmQ3Lvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLpGT50bmzBgH for ; Wed, 03 Dec 2025 06:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 06:52:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: ef8a0ef2aa97 - main - ofw: Fix 64-bit arithmetic in cpufreq_dt.c. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef8a0ef2aa97650f37052719496bfbe4ab97a019 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 06:52:01 +0000 Message-Id: <692fde11.23e1d.4fb59109@gitrepo.freebsd.org> The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=ef8a0ef2aa97650f37052719496bfbe4ab97a019 commit ef8a0ef2aa97650f37052719496bfbe4ab97a019 Author: Michal Meloun AuthorDate: 2025-12-02 12:02:39 +0000 Commit: Michal Meloun CommitDate: 2025-12-03 06:47:41 +0000 ofw: Fix 64-bit arithmetic in cpufreq_dt.c. MFC after: 3 weeks --- sys/dev/cpufreq/cpufreq_dt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/cpufreq/cpufreq_dt.c b/sys/dev/cpufreq/cpufreq_dt.c index b212b08e9a83..44334cbcab57 100644 --- a/sys/dev/cpufreq/cpufreq_dt.c +++ b/sys/dev/cpufreq/cpufreq_dt.c @@ -210,7 +210,7 @@ cpufreq_dt_set(device_t dev, const struct cf_setting *set) } else uvolt = 0; - opp = cpufreq_dt_find_opp(sc->dev, set->freq * 1000000); + opp = cpufreq_dt_find_opp(sc->dev, (uint64_t)set->freq * 1000000); if (opp == NULL) { device_printf(dev, "Couldn't find an opp for this freq\n"); return (EINVAL); From nobody Wed Dec 3 11:34:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLwX66N9zz6JCGt for ; Wed, 03 Dec 2025 11:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLwX65cGTz41Lk for ; Wed, 03 Dec 2025 11:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764761654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+0PqQgQOTiETlTc3VNTKzkZvmu0TDG8KWQ3vkDXUl0s=; b=DT2C/FVHPWIpC9TX8AtkZKTXUZCG0pjwXG6C+Dpc7h/hdjyEDjyabpdEnvNA98PgyeKiuO nEa6w6fKjhWi1EML1FGWe+f1eeEK48EFKar64xziQlIOmWSeBeTrsynxhmCWEqtya2UlpN YMX8PAnm9QOX4MzuK3BxIMgZEYGSdYP50iScQ/kEcH5xiwuwGfWiUL4YTnSPZAUa+47vFu Ct/0ykoexpa0GtEWI0shb6ewf9lA1Fvm1nz+qcfCrQJMJaRUIP/VRXO+Vw6+XKM14AGVSD hekpZsXRA8xxxkfoep97q0W2QkyPqQdhvl/S4i/RGuOVegZrH6a+H76A5RqhoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764761654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+0PqQgQOTiETlTc3VNTKzkZvmu0TDG8KWQ3vkDXUl0s=; b=HFjl+8sjJg7CgoY7VbT4WVv1Q21dcdbC85XOz9a+KoqdsKE2yZvb3IOx04PS/fQuGV7z7K ONhK8z20VnQzT+BqT360aIVw7qINk2/BiJvfv66nXC+qj771SgjfFV9jxFWhl3mCWXwgWZ OnIWsra6leL578PDQUyd0SWLCkDtWuPVUW/XbOL8qcgygEdDpccEB/N5Ea0gFj96fypsAK eKTd0bcQ1hzOOy8r0ztkYNkX3HECjRa7zDEOT/MGomjoQM0di6+JMsC1HuKGuZbKIb6mXK xWw5PXajHt396fr0W5V6/DZD1vyFfT9WDEkIhhFhDXJeicx79CTjFWdA6HfPyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764761654; a=rsa-sha256; cv=none; b=PrdGUOUgaBfOdKPK5j5o9IPpaPr9SZWRL0J6nEeukBDEWTn0SWeWOMS0alsnCHCj0vfBS0 TmbK4ixZf7ENz8yl5BSgGe1Twc/Mx814jHptO4icno1IENl1/azmkfeOkmtEYdEg1pyaPY KFWFSTmgNVxCnXwj+ToklJddhLwGAv/bYhpyWUi2CeqvDIcua2cVERZOr5yiDmwTFuXYSB AsC9RhTYz4N6sVJOgLGG5uhR+SRumTtSCesisJk5r3nCuAsf95jz77se7Twdx3t2sblM8b kU4+Up3NVNTPkxGUe5/Um1wbZMux3P216K1Y+Kt1y5kcp5q+Tzve4KSO0ghp7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLwX657llzbv2 for ; Wed, 03 Dec 2025 11:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f881 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 11:34:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: b42fda6be3fd - main - share/mk: Include libbnxtre entry in bsd.libnames.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b42fda6be3fde001cdbe1623cc89b1dc9faf1b93 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 11:34:14 +0000 Message-Id: <69302036.3f881.1fb71f91@gitrepo.freebsd.org> The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=b42fda6be3fde001cdbe1623cc89b1dc9faf1b93 commit b42fda6be3fde001cdbe1623cc89b1dc9faf1b93 Author: Sumit Saxena AuthorDate: 2025-12-03 11:21:10 +0000 Commit: Sumit Saxena CommitDate: 2025-12-03 11:33:40 +0000 share/mk: Include libbnxtre entry in bsd.libnames.mk Add libbnxtre entry in bsd.libnames.mk file. MFC-After: 3 days Reviewed-by: sumit.saxena@broadcom.com Differential-Revision: https://reviews.freebsd.org/D49603 --- lib/ofed/Makefile | 1 + share/mk/bsd.libnames.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/ofed/Makefile b/lib/ofed/Makefile index a16e93adc149..5421e2e43cd1 100644 --- a/lib/ofed/Makefile +++ b/lib/ofed/Makefile @@ -10,6 +10,7 @@ SUBDIR= \ libcxgb4 \ libmlx4 \ libmlx5 \ + libbnxtre \ libirdma \ libibnetdisc \ libopensm diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 54bdfd301cd3..955e3c4ebdef 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -118,6 +118,7 @@ LIBMENU?= ${LIBDESTDIR}${LIBDIR_BASE}/libmenu.a LIBMILTER?= ${LIBDESTDIR}${LIBDIR_BASE}/libmilter.a LIBMLX4?= ${LIBDESTDIR}${LIBDIR_BASE}/libmlx4.a LIBMLX5?= ${LIBDESTDIR}${LIBDIR_BASE}/libmlx5.a +LIBBNXTRE?= ${LIBDESTDIR}${LIBDIR_BASE}/libbnxtre.a LIBMP?= ${LIBDESTDIR}${LIBDIR_BASE}/libmp.a LIBMT?= ${LIBDESTDIR}${LIBDIR_BASE}/libmt.a LIBNCURSES?= ${LIBDESTDIR}${LIBDIR_BASE}/libncurses.a From nobody Wed Dec 3 11:34:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLwX82JMWz6JC85 for ; Wed, 03 Dec 2025 11:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLwX76PyVz41JD for ; Wed, 03 Dec 2025 11:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764761655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gsg9nybNYRzDSu+uYHimoxANBdtFZAswktcahgtW1iE=; b=xVXFTZoB2S87O3R59wNzKQQRkuqSFnQ0R/uNg6xSEx6xfSRWW01XyNKuKcgBRhHdgZrKaR UFBcn4ERTrGvkhtGnSvFnXION/xJCZmqdF99EBfAJUp5raqdROP1RWE1gMDExVk1fMSP73 DnAQAK6fGC2e8saidOuGYKUBN7d8a0E4RcK37CwyRHzIj+ZK+bqeFf+6H3DoBe1lbgkknB WMH9HEaPTLdlBtBKmGB/9W24841ryVMZJ9lpdNOcOS5cpP6BJ+keHl01etw7xqo5NGiXGe Qw5xGm4vDONI/7gfYz04JG1PN1TLyYecQhuY1TVB//FgQAYT/27/xzj4Is1MrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764761655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gsg9nybNYRzDSu+uYHimoxANBdtFZAswktcahgtW1iE=; b=qEDIMCAIs1vsPN3ohFJHbnd4a+geV+PBUlBzc8AvmJEso2qGSLT04cxr2K2EhTCJOUzTct QuhGk9D6ZP14lMn3erNvjQMGD7au5ZPJMXuPXYjgriHHVjRvO43u5E3LJa3jWlR6Ey8lfo w7ISwAtVfhCgO1EAK+cPKSz75dpSlr+qGTrEzNkqGQDLZVNyEVmPYyeVpjvjvboWqaR7CR 4s02O2a6It3Jw3CkjWyTb+2gluoiIh7f+lipGVXWOhAoQPcCcCvQYjH7Xhz+BPYBJW0B6t ssIyJpm+sCGHg5MaFDvHRhOeoHnhbFXGOOkm4UkcOPD37sXB7bUC55NDdkp7JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764761655; a=rsa-sha256; cv=none; b=c8k9A8vLoEl1W2V+tby5bjoTKRebKISr/SAcCO1coNvlqvQk0koPbEQL9qQ0IRcL/6J22H ivYqJDAE4fCvjx0Xgg10hy1zmdMdTx428RHQbvg8cm+7ECgr+hlmLNKzlwORlB0IL7SXHi R34jUk+EENhP5/SnQyBB96kkr1Nm7pNUX5cHQnwoMUY5XGONmO5EqymuAfkDOidzCdyWfy uPuQ5iX2JwJDL0/EokGC/eNmJUuNuJiEioxT9Q7XxMNUGVOU+/pebOIUBxBQ9Gvx9jO78X weIUBpmywd75rUgH+rZWQeLJ/SVcPpyyoYUucG5SmfWwctRL5Buf/9qBnepW7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dLwX75yTBzbv3 for ; Wed, 03 Dec 2025 11:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d155 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 11:34:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 35dd53a9e132 - main - librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35dd53a9e13265f7a479649776453efc5b737a0f Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 11:34:15 +0000 Message-Id: <69302037.3d155.40084cd7@gitrepo.freebsd.org> The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=35dd53a9e13265f7a479649776453efc5b737a0f commit 35dd53a9e13265f7a479649776453efc5b737a0f Author: Sumit Saxena AuthorDate: 2025-12-03 11:28:33 +0000 Commit: Sumit Saxena CommitDate: 2025-12-03 11:33:40 +0000 librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping By default ibv_devices and rping are not statically bound to libbnxtre.so.1. i.e. 'ldd /usr/bin/rping' command doesn't list 'libbnxtre.so.1' entry. So, statically bound the libbnxtre.so.1 library to rping & ibv_devices utils. MFC-After: 3 days Reviewed-by: sumit.saxena@broadcom.com Differential-Revision: https://reviews.freebsd.org/D49604 --- share/mk/src.libnames.mk | 7 +++++-- usr.bin/ofed/libibverbs/Makefile.inc | 2 +- usr.bin/ofed/librdmacm/Makefile.inc | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index e108cc15fb55..125fe2242bd5 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -285,6 +285,7 @@ _LIBRARIES+= \ irdma \ mlx4 \ mlx5 \ + bnxtre \ rdmacm \ osmcomp \ opensm \ @@ -360,7 +361,7 @@ _DP_cap_sysctl= nv _DP_cap_syslog= nv _DP_crypt= md .if ${MK_OFED} != "no" -_DP_pcap= ibverbs mlx5 +_DP_pcap= ibverbs mlx5 bnxtre .endif _DP_pjdlog= util _DP_usb= pthread @@ -511,11 +512,12 @@ _DP_cxgb4= ibverbs pthread _DP_ibcm= ibverbs _DP_ibmad= ibumad _DP_ibnetdisc= osmcomp ibmad ibumad -_DP_ibumad= +_DP_ibumad= _DP_ibverbs= _DP_irdma= ibverbs pthread _DP_mlx4= ibverbs pthread _DP_mlx5= ibverbs pthread +_DP_bnxtre= ibverbs pthread _DP_rdmacm= ibverbs _DP_osmcomp= pthread _DP_opensm= pthread @@ -810,6 +812,7 @@ LIBIBVERBSDIR= ${_LIB_OBJTOP}/lib/ofed/libibverbs LIBIRDMADIR= ${_LIB_OBJTOP}/lib/ofed/libirdma LIBMLX4DIR= ${_LIB_OBJTOP}/lib/ofed/libmlx4 LIBMLX5DIR= ${_LIB_OBJTOP}/lib/ofed/libmlx5 +LIBBNXTREDIR= ${_LIB_OBJTOP}/lib/ofed/libbnxtre LIBRDMACMDIR= ${_LIB_OBJTOP}/lib/ofed/librdmacm LIBOSMCOMPDIR= ${_LIB_OBJTOP}/lib/ofed/complib LIBOPENSMDIR= ${_LIB_OBJTOP}/lib/ofed/libopensm diff --git a/usr.bin/ofed/libibverbs/Makefile.inc b/usr.bin/ofed/libibverbs/Makefile.inc index 616c9bd54707..f8301c3d1073 100644 --- a/usr.bin/ofed/libibverbs/Makefile.inc +++ b/usr.bin/ofed/libibverbs/Makefile.inc @@ -3,6 +3,6 @@ _spath=${SRCTOP}/contrib/ofed/libibverbs BINDIR?= /usr/bin CFLAGS+= -I${_spath} -LIBADD+= ibverbs mlx4 mlx5 cxgb4 irdma pthread +LIBADD+= ibverbs mlx4 mlx5 bnxtre cxgb4 irdma pthread WARNS?= 2 diff --git a/usr.bin/ofed/librdmacm/Makefile.inc b/usr.bin/ofed/librdmacm/Makefile.inc index 74f32fe08b42..66fcf2ac267b 100644 --- a/usr.bin/ofed/librdmacm/Makefile.inc +++ b/usr.bin/ofed/librdmacm/Makefile.inc @@ -3,6 +3,6 @@ _spath=${SRCTOP}/contrib/ofed/librdmacm BINDIR?= /usr/bin CFLAGS+= -I${SRCTOP}/contrib/ofed -LIBADD+= ibverbs rdmacm irdma mlx4 mlx5 cxgb4 pthread +LIBADD+= ibverbs rdmacm irdma mlx4 mlx5 bnxtre cxgb4 pthread WARNS?= 0 From nobody Wed Dec 3 14:05:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dLzv90P7zz6JRjh; Wed, 03 Dec 2025 14:05:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dLzv85GkQz4Mwn; Wed, 03 Dec 2025 14:05:56 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004b.ext.cloudfilter.net ([10.228.9.230]) by cmsmtp with ESMTPS id QjdxvQ7sxPzKyQnUSvfadM; Wed, 03 Dec 2025 14:05:56 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id QnUQvI3l35aoCQnURven3v; Wed, 03 Dec 2025 14:05:55 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=YMSSCBGx c=1 sm=1 tr=0 ts=693043c3 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=wP3pNCr1ah4A:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=Q-fNiiVtAAAA:8 a=YxBL1-UpAAAA:8 a=F3s4GREXQDzkHWVKJioA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 1D9C2509; Wed, 03 Dec 2025 06:05:54 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 150B71E8; Wed, 03 Dec 2025 06:05:54 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Sumit Saxena cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 35dd53a9e132 - main - librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping In-reply-to: <69302037.3d155.40084cd7@gitrepo.freebsd.org> References: <69302037.3d155.40084cd7@gitrepo.freebsd.org> Comments: In-reply-to Sumit Saxena message dated "Wed, 03 Dec 2025 11:34:15 +0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 03 Dec 2025 06:05:54 -0800 Message-Id: <20251203140554.150B71E8@slippy.cwsent.com> X-CMAE-Envelope: MS4xfNuUThzO7MZ4jxFnJZpRQPIKETlA+HjFWZWsvIdU1OncXsQZviEyxmZaQqS7UuLfgreuVeK1uUPqphJQjNfmCik0/9UkEvr1mwRTQwMNxZitNyVPqjj7 EtsyXygDWppXdmRff9TdRoCPCjOs/R2POY2Lcay2/Me3OZVBGjCeh3fAbiDXy5aWXu8aDZn9+SLWu/Bhz8YcNWv9jTR8fy4KW+Xb7/GzYe7ebbpoFcYVf1Sa TW580eR4dcKWagWnT26RogO+CRcDdTkjtq0AkUjVdAuae0+y4VqMORsh/qJvvg5Z02EHlvJTPM6htU9IP+gLs8Q3ulYUOP7lGKFcP1U7ijk= X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dLzv85GkQz4Mwn In message <69302037.3d155.40084cd7@gitrepo.freebsd.org>, Sumit Saxena writes: > The branch main has been updated by ssaxena: > > URL: https://cgit.FreeBSD.org/src/commit/?id=35dd53a9e13265f7a479649776453efc > 5b737a0f > > commit 35dd53a9e13265f7a479649776453efc5b737a0f > Author: Sumit Saxena > AuthorDate: 2025-12-03 11:28:33 +0000 > Commit: Sumit Saxena > CommitDate: 2025-12-03 11:33:40 +0000 > > librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping > > By default ibv_devices and rping are not statically bound to > libbnxtre.so.1. i.e. 'ldd /usr/bin/rping' command doesn't list > 'libbnxtre.so.1' entry. So, statically bound the libbnxtre.so.1 > library to rping & ibv_devices utils. > > MFC-After: 3 days > Reviewed-by: sumit.saxena@broadcom.com It's odd to review your own work. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 > Differential-Revision: https://reviews.freebsd.org/D49604 > --- > share/mk/src.libnames.mk | 7 +++++-- > usr.bin/ofed/libibverbs/Makefile.inc | 2 +- > usr.bin/ofed/librdmacm/Makefile.inc | 2 +- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk > index e108cc15fb55..125fe2242bd5 100644 > --- a/share/mk/src.libnames.mk > +++ b/share/mk/src.libnames.mk > @@ -285,6 +285,7 @@ _LIBRARIES+= \ > irdma \ > mlx4 \ > mlx5 \ > + bnxtre \ > rdmacm \ > osmcomp \ > opensm \ > @@ -360,7 +361,7 @@ _DP_cap_sysctl= nv > _DP_cap_syslog= nv > _DP_crypt= md > .if ${MK_OFED} != "no" > -_DP_pcap= ibverbs mlx5 > +_DP_pcap= ibverbs mlx5 bnxtre > .endif > _DP_pjdlog= util > _DP_usb= pthread > @@ -511,11 +512,12 @@ _DP_cxgb4= ibverbs pthread > _DP_ibcm= ibverbs > _DP_ibmad= ibumad > _DP_ibnetdisc= osmcomp ibmad ibumad > -_DP_ibumad= > +_DP_ibumad= > _DP_ibverbs= > _DP_irdma= ibverbs pthread > _DP_mlx4= ibverbs pthread > _DP_mlx5= ibverbs pthread > +_DP_bnxtre= ibverbs pthread > _DP_rdmacm= ibverbs > _DP_osmcomp= pthread > _DP_opensm= pthread > @@ -810,6 +812,7 @@ LIBIBVERBSDIR= ${_LIB_OBJTOP}/lib/ofed/libibverbs > LIBIRDMADIR= ${_LIB_OBJTOP}/lib/ofed/libirdma > LIBMLX4DIR= ${_LIB_OBJTOP}/lib/ofed/libmlx4 > LIBMLX5DIR= ${_LIB_OBJTOP}/lib/ofed/libmlx5 > +LIBBNXTREDIR= ${_LIB_OBJTOP}/lib/ofed/libbnxtre > LIBRDMACMDIR= ${_LIB_OBJTOP}/lib/ofed/librdmacm > LIBOSMCOMPDIR= ${_LIB_OBJTOP}/lib/ofed/complib > LIBOPENSMDIR= ${_LIB_OBJTOP}/lib/ofed/libopensm > diff --git a/usr.bin/ofed/libibverbs/Makefile.inc b/usr.bin/ofed/libibverbs/M > akefile.inc > index 616c9bd54707..f8301c3d1073 100644 > --- a/usr.bin/ofed/libibverbs/Makefile.inc > +++ b/usr.bin/ofed/libibverbs/Makefile.inc > @@ -3,6 +3,6 @@ _spath=${SRCTOP}/contrib/ofed/libibverbs > > BINDIR?= /usr/bin > CFLAGS+= -I${_spath} > -LIBADD+= ibverbs mlx4 mlx5 cxgb4 irdma pthread > +LIBADD+= ibverbs mlx4 mlx5 bnxtre cxgb4 irdma pthread > > WARNS?= 2 > diff --git a/usr.bin/ofed/librdmacm/Makefile.inc b/usr.bin/ofed/librdmacm/Mak > efile.inc > index 74f32fe08b42..66fcf2ac267b 100644 > --- a/usr.bin/ofed/librdmacm/Makefile.inc > +++ b/usr.bin/ofed/librdmacm/Makefile.inc > @@ -3,6 +3,6 @@ _spath=${SRCTOP}/contrib/ofed/librdmacm > > BINDIR?= /usr/bin > CFLAGS+= -I${SRCTOP}/contrib/ofed > -LIBADD+= ibverbs rdmacm irdma mlx4 mlx5 cxgb4 pthread > +LIBADD+= ibverbs rdmacm irdma mlx4 mlx5 bnxtre cxgb4 pthread > > WARNS?= 0 > From nobody Wed Dec 3 14:13:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM04R0L1pz6JSbH for ; Wed, 03 Dec 2025 14:13:59 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM04Q5PcNz4PFQ for ; Wed, 03 Dec 2025 14:13:58 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-47774d3536dso9182395e9.0 for ; Wed, 03 Dec 2025 06:13:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764771237; x=1765376037; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Nq/FfCfvjQBjKAlsF+HKngDRzRKF+mnN1WvhXN45wuc=; b=nXvJe4CrtJJrhakikSjwKDyU+vbQ0XHGNOeS27hpbDIlKZonFSH2/DiQElDwgPJPQV x4twx0paqCEF2BeZzcxtksxnBi0aHsetuIe1WmAVnXwNjkmucA08cNFnOw1ME9eIyLcV 0k3yqsM4v/pzSh9TXEPy3EaKUepH11sDRWYxJgmI4hj9ulwZrkm5M+AVYgzijFiQuVeY CtHkaDNcUptBjhPznvrD7pK7NLuDM6v+t/TeuQTroqYPS155FY7fFJqNYtdbMysZks5n /bRdhzO9LWwU/6xycqsqdFUL582GI4BLujDoqvjuduSifKx1UNVZZGrXl0p4vIIn/yGl Me8w== X-Forwarded-Encrypted: i=1; AJvYcCV7J+0juw+Y35xbZ/sVWE9vDXMpm448+9qBLAA89SjQDIdzPGGn53/A3hrlBzeYIfhjQpXwzV8OORBm9NarHRNQLzzLcQ==@freebsd.org X-Gm-Message-State: AOJu0Yz62uYtmnrkzOBmUzE1SRD80I+OBvNQzhBZG5mC6RxExFinuj51 fgU/RG1Nllni+nkIbwt0a9CdL6IapQq8484hTZjtrMr5OVk/bG6viBvqop91f/R5oSM= X-Gm-Gg: ASbGncv6GgU3AB9L3glM2g5X1lGOm+0Vl2yPghWt5CllNYA1PfuFWQFMVlbSrDEjyTf xBtAuVX8iial8BwcZm8GXYBUfOzdpwIExZz5RwWvCEImixiAoSTDsXM0DSxgpVLNHnW09AD4Aam 0bH5Hd2uyhwRIYUJkMMcboIP7F9pzSjHyjupCI9FKQXbma9eZlTBGIXosLj2iT3dH5lq6rNuPug uheWnipK4teAoc7oomZV+E8OKRg5QcE5OPW5k593NLlw4dxR21f89i1bNmgwZTcEmRecalE2ngg jB/dhJR4O9QszOqlV0EQlp4y6IFFE0SB51LtpBLYILxlP8mdzBQWqGMMx3XHTH8aTM7rjxb7HJ6 HE7aWb+lVcXhn3LeF2olOg9bIUkgIl0FDx8esKetf1EAOGOg59YPgDCAfYpSlnvOLdKSQ6/BaAn JxOcfF9ZmhvDdOAe9/bHK3N2IUgwNJzXEiyba45b9VL0UkI/OxeyFz X-Google-Smtp-Source: AGHT+IH2xOr51ISKM31huCNN/YiF4XO93oMkOeUcYUGdFUgH/MqXG7rYmI3aK4ZlTXM+HjTGpJa1AQ== X-Received: by 2002:a05:600c:4507:b0:479:2a78:4a2e with SMTP id 5b1f17b1804b1-4792aeefe08mr29767355e9.7.1764771236863; Wed, 03 Dec 2025 06:13:56 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4792b178959sm19104275e9.8.2025.12.03.06.13.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Dec 2025 06:13:55 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.200.81.1.6\)) Subject: Re: git: 35dd53a9e132 - main - librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping From: Jessica Clarke In-Reply-To: <69302037.3d155.40084cd7@gitrepo.freebsd.org> Date: Wed, 3 Dec 2025 14:13:44 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <69302037.3d155.40084cd7@gitrepo.freebsd.org> To: Sumit Saxena X-Mailer: Apple Mail (2.3864.200.81.1.6) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dM04Q5PcNz4PFQ On 3 Dec 2025, at 11:34, Sumit Saxena wrote: >=20 > The branch main has been updated by ssaxena: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D35dd53a9e13265f7a479649776453efc= 5b737a0f >=20 > commit 35dd53a9e13265f7a479649776453efc5b737a0f > Author: Sumit Saxena > AuthorDate: 2025-12-03 11:28:33 +0000 > Commit: Sumit Saxena > CommitDate: 2025-12-03 11:33:40 +0000 >=20 > librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping >=20 > By default ibv_devices and rping are not statically bound to > libbnxtre.so.1. i.e. 'ldd /usr/bin/rping' command doesn't list > 'libbnxtre.so.1' entry. So, statically bound the libbnxtre.so.1 > library to rping & ibv_devices utils. Firstly, this is some very unusual terminology, there=E2=80=99s no = =E2=80=9Cbinding=E2=80=9D going on here (binding in ELF linker/loader terminology is about symbols, not libraries), it=E2=80=99s =E2=80=9Clinking=E2=80=9D. Also, = whilst strictly true that this pertains to the static linker, repeating the static part makes it sound like you=E2=80=99re talking about static linking in the = ld -static / libfoo.a sense, which would still have the effect of not showing up in ldd=E2=80=99s output. Secondly, this states some things, but I don=E2=80=99t see why this = change follows from it. *Why* does it matter that ibv_devices and rping do not link against libbnxtre? If it builds, that means none of libbnxtre=E2=80=99= s symbols were needed. Is there some magic dynamic registration going on in linker sets / constructors inside libbnxtre? Please explain the why in the commit message. Jessica From nobody Wed Dec 3 14:15:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM06v1lJBz6JRXb for ; Wed, 03 Dec 2025 14:16:07 +0000 (UTC) (envelope-from sumit.saxena@broadcom.com) Received: from mail-pg1-x562.google.com (mail-pg1-x562.google.com [IPv6:2607:f8b0:4864:20::562]) (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 4dM06t5G0lz4PsJ for ; Wed, 03 Dec 2025 14:16:06 +0000 (UTC) (envelope-from sumit.saxena@broadcom.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pg1-x562.google.com with SMTP id 41be03b00d2f7-ba599137cf8so435312a12.0 for ; Wed, 03 Dec 2025 06:16:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764771360; x=1765376160; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xDK2JzyjjfMx+KHpxakwNWqInu3r8u6TCwBlScyOw0o=; b=GCqpE2R82PPLyC4CrAGJprWETWHT1P5sVX+dwrKaF6x/YIPOrJP8nElE7+1prDKD/G sEhTDduDUX48v+BubJpZh+kaQ7GDulSsGVeFs7jGN43pAUr5SXT4HfC1DRuvCC7K7FXc 4PNZ/PKRl5ScjVxyRGB//aQtt5oXSUb6VDN2HR2Fq3uuHj+oA5dsPect9hW3CQb6epJ1 B9d4IHWb+ErLOpL8SR+Lj8cLPAfP2/s0weEhJhRzfjLl4/o3iM7CQSSwLoLiF8OM7nW0 nii1FlJLh8LJ+TKe87TCggPAa/fhU8pbWa/H4WwhBfD0n8XiUekKHQkEqkYLt65aExHK QJjg== X-Forwarded-Encrypted: i=1; AJvYcCVeNFxNj10ErT5FcoI+GMPRyUHURUh4305RrJ8L7HPGPvRFXnSwnkP88frKTLJsSuUZE/PtaLQLZZeKY6mzl18lhGJ6EQ==@freebsd.org X-Gm-Message-State: AOJu0Yx5FcGp1XvVGqqrZ2EZYqCmGvH50UoZMYjIhipuToqjVrCMz/YT sXMInGagp5SGKJHF52v0TeAp2pp8WswOY7FmF3DOgtGRcVRrnu3FffrXkCyPmQs7Yi5pcGeYP8K c7hzqHwgkW6tLb5PdcxC9+3z46busLmmr+5uOol+/IQpqCY61vgZZtyuLuM51VP15p9v7XPZCof cy6TZGJx6weEuk/vbAr1JGHOI36cZBIoDiNDlv7bcFzpa4oDwy/bpGL+lbLUPzowX1tglkVhcxO 0F9wgQgA6v8W9bmGsK5eEz5 X-Gm-Gg: ASbGncvzGiDod6fyRbd7aIUmP9Ixc+gWTWizut4IpqvFeYypoLV78F7mGpkMG8qDwLV O1zIzgG9ocN8ITFAU6N6RnE1IraGtVVeu7geeDZlTU8xJlzfzOHqurxmvjQcV/+TMMRMAFaCcKi ha3xtcCb0TdxpIBMXP33oodTzE9DP0uKFSa8Ss/pPzB2rOOuLLGnuzsPYuLmjAqWuO/GHvd5wCu sDfS0E2e56TQQJFBpqbOFCOaKf5OATf4pjc4F+QTMy0Rg8RxnK0jFx/pAvUYwLS5r/+e3tl5/UA /NFEw2CW0fVZbQvxETQJ8VdpCK5MYGXZw8et9JCs7gzv6bZSRllNRuKHhNLU4+0H+9QbAaC2xvb H2j0JcUKUVgLm68on1mjms2UECysvQIFKH6JhJplfUMmAQ8sVtnXO/Dk5CjYIlTa2qtAh1inZD3 tptoFd37yJvknyo0auHkHLntOS8zAYDydJIPm9s4S7pU5+Ka0= X-Google-Smtp-Source: AGHT+IF7OtjwUqhhy9g+U1yd0mqCmR5kog0Z5yiXR/omBIzdVTxxU/SWf14foeSSHvReZxIPUI3HiXfiJM6F X-Received: by 2002:a17:902:e784:b0:295:6850:a38d with SMTP id d9443c01a7336-29d5a5a4b46mr65806095ad.19.1764771359828; Wed, 03 Dec 2025 06:15:59 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-103.dlp.protect.broadcom.com. [144.49.247.103]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-29bce41bc81sm25259495ad.13.2025.12.03.06.15.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Dec 2025 06:15:59 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-59434b284f8so3653419e87.3 for ; Wed, 03 Dec 2025 06:15:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1764771358; x=1765376158; 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=xDK2JzyjjfMx+KHpxakwNWqInu3r8u6TCwBlScyOw0o=; b=gJYR/Cb/3IvMrw1EIFSbhf4miko8Lp7YK3SMHodSaCt3htKRM+U6GbIUFV+uJySvGE gmRx9Lkeanfd/kYYN6db1EMlp7D/mGRIfHIi4yKlJVe3ru41b/n4LzR9QalYwi7r02El rNVrVszG7R1yIdX/X9elnArwpQovV95vulUMY= X-Forwarded-Encrypted: i=1; AJvYcCXzOMSUcbtZynhaY4KLHlpsaG4wokaXehnfJFRRVSsarirp/SXEskT4V4gnJrEzZyLSiJY7qRsNXrP9Mdl8kqSYF4i80w==@freebsd.org X-Received: by 2002:a05:6512:3049:b0:594:26d7:c443 with SMTP id 2adb3069b0e04-597d3fee4c0mr1161786e87.39.1764771357709; Wed, 03 Dec 2025 06:15:57 -0800 (PST) X-Received: by 2002:a05:6512:3049:b0:594:26d7:c443 with SMTP id 2adb3069b0e04-597d3fee4c0mr1161767e87.39.1764771357098; Wed, 03 Dec 2025 06:15:57 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <69302037.3d155.40084cd7@gitrepo.freebsd.org> <20251203140554.150B71E8@slippy.cwsent.com> In-Reply-To: <20251203140554.150B71E8@slippy.cwsent.com> From: Sumit Saxena Date: Wed, 3 Dec 2025 19:45:37 +0530 X-Gm-Features: AWmQ_bkqKtZwwFNI12-VCPJJhCQqDOwGGhD8cVmYwMqFuuHgyLSZey3dSFU7slI Message-ID: Subject: Re: git: 35dd53a9e132 - main - librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping To: Cy Schubert Cc: Sumit Saxena , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="000000000000e8be5206450cd99a" X-Spamd-Bar: ---- 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-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dM06t5G0lz4PsJ --000000000000e8be5206450cd99a Content-Type: multipart/alternative; boundary="000000000000d99b4906450cd901" --000000000000d99b4906450cd901 Content-Type: text/plain; charset="UTF-8" My name is inadvertently listed as the 'Author' in the commit message. I am the reviewer and committer for this patch. The correct author is captured in the review link: https://reviews.freebsd.org/D49604 (https://reviews.freebsd.org/D49604). Thanks, Sumit --000000000000d99b4906450cd901 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

My name is inadvertently listed as the= 'Author' in the commit message. I am the reviewer and committer fo= r this patch.
The correct author is captured in the review link: = https://reviews.freebsd.org/= D49604 (https://reviews.= freebsd.org/D49604).

Thanks,
Sumit
--000000000000d99b4906450cd901-- --000000000000e8be5206450cd99a Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIIVWQYJKoZIhvcNAQcCoIIVSjCCFUYCAQExDzANBglghkgBZQMEAgEFADALBgkqhkiG9w0BBwGg ghLGMIIGqDCCBJCgAwIBAgIQfofDCS7XZu8vIeKo0KeY9DANBgkqhkiG9w0BAQwFADBMMSAwHgYD VQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UE AxMKR2xvYmFsU2lnbjAeFw0yMzA0MTkwMzUzNTNaFw0yOTA0MTkwMDAwMDBaMFIxCzAJBgNVBAYT AkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIEdDQyBS NiBTTUlNRSBDQSAyMDIzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwjAEbSkPcSyn 26Zn9VtoE/xBvzYmNW29bW1pJZ7jrzKwPJm/GakCvy0IIgObMsx9bpFaq30X1kEJZnLUzuE1/hlc hatYqyORVBeHlv5V0QRSXY4faR0dCkIhXhoGknZ2O0bUJithcN1IsEADNizZ1AJIaWsWbQ4tYEYj ytEdvfkxz1WtX3SjtecZR+9wLJLt6HNa4sC//QKdjyfr/NhDCzYrdIzAssoXFnp4t+HcMyQTrj0r pD8KkPj96sy9axzegLbzte7wgTHbWBeJGp0sKg7BAu+G0Rk6teO1yPd75arbCvfY/NaRRQHk6tmG 71gpLdB1ZhP9IcNYyeTKXIgfMh2tVK9DnXGaksYCyi6WisJa1Oa+poUroX2ESXO6o03lVxiA1xyf G8lUzpUNZonGVrUjhG5+MdY16/6b0uKejZCLbgu6HLPvIyqdTb9XqF4XWWKu+OMDs/rWyQ64v3mv Sa0te5Q5tchm4m9K0Pe9LlIKBk/gsgfaOHJDp4hYx4wocDr8DeCZe5d5wCFkxoGc1ckM8ZoMgpUc 4pgkQE5ShxYMmKbPvNRPa5YFzbFtcFn5RMr1Mju8gt8J0c+dxYco2hi7dEW391KKxGhv7MJBcc+0 x3FFTnmhU+5t6+CnkKMlrmzyaoeVryRTvOiH4FnTNHtVKUYDsCM0CLDdMNgoxgkCAwEAAaOCAX4w ggF6MA4GA1UdDwEB/wQEAwIBhjBMBgNVHSUERTBDBggrBgEFBQcDAgYIKwYBBQUHAwQGCisGAQQB gjcUAgIGCisGAQQBgjcKAwwGCisGAQQBgjcKAwQGCSsGAQQBgjcVBjASBgNVHRMBAf8ECDAGAQH/ AgEAMB0GA1UdDgQWBBQAKTaeXHq6D68tUC3boCOFGLCgkjAfBgNVHSMEGDAWgBSubAWjkxPioufi 1xzWx/B/yGdToDB7BggrBgEFBQcBAQRvMG0wLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwMi5nbG9i YWxzaWduLmNvbS9yb290cjYwOwYIKwYBBQUHMAKGL2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5j b20vY2FjZXJ0L3Jvb3QtcjYuY3J0MDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwuZ2xvYmFs c2lnbi5jb20vcm9vdC1yNi5jcmwwEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEBDAUAA4IC AQCRkUdr1aIDRmkNI5jx5ggapGUThq0KcM2dzpMu314mJne8yKVXwzfKBtqbBjbUNMODnBkhvZcn bHUStur2/nt1tP3ee8KyNhYxzv4DkI0NbV93JChXipfsan7YjdfEk5vI2Fq+wpbGALyyWBgfy79Y IgbYWATB158tvEh5UO8kpGpjY95xv+070X3FYuGyeZyIvao26mN872FuxRxYhNLwGHIy38N9ASa1 Q3BTNKSrHrZngadofHglG5W3TMFR11JOEOAUHhUgpbVVvgCYgGA6dSX0y5z7k3rXVyjFOs7KBSXr dJPKadpl4vqYphH7+P40nzBRcxJHrv5FeXlTrb+drjyXNjZSCmzfkOuCqPspBuJ7vab0/9oeNERg nz6SLCjLKcDXbMbKcRXgNhFBlzN4OUBqieSBXk80w2Nzx12KvNj758WavxOsXIbX0Zxwo1h3uw75 AI2v8qwFWXNclO8qW2VXoq6kihWpeiuvDmFfSAwRLxwwIjgUuzG9SaQ+pOomuaC7QTKWMI0hL0b4 mEPq9GsPPQq1UmwkcYFJ/Z4I93DZuKcXmKMmuANTS6wxwIEw8Q5MQ6y9fbJxGEOgOgYL4QIqNULb 5CYPnt2LeiIiEnh8Uuh8tawqSjnR0h7Bv5q4mgo3L1Z9QQuexUntWD96t4o0q1jXWLyrpgP7Zcnu CzCCBYMwggNroAMCAQICDkXmuwODM8OFZUjm/0VRMA0GCSqGSIb3DQEBDAUAMEwxIDAeBgNVBAsT F0dsb2JhbFNpZ24gUm9vdCBDQSAtIFI2MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpH bG9iYWxTaWduMB4XDTE0MTIxMDAwMDAwMFoXDTM0MTIxMDAwMDAwMFowTDEgMB4GA1UECxMXR2xv YmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh bFNpZ24wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCVB+hzymb57BTKezz3DQjxtEUL LIK0SMbrWzyug7hBkjMUpG9/6SrMxrCIa8W2idHGsv8UzlEUIexK3RtaxtaH7k06FQbtZGYLkoDK RN5zlE7zp4l/T3hjCMgSUG1CZi9NuXkoTVIaihqAtxmBDn7EirxkTCEcQ2jXPTyKxbJm1ZCatzEG xb7ibTIGph75ueuqo7i/voJjUNDwGInf5A959eqiHyrScC5757yTu21T4kh8jBAHOP9msndhfuDq jDyqtKT285VKEgdt/Yyyic/QoGF3yFh0sNQjOvddOsqi250J3l1ELZDxgc1Xkvp+vFAEYzTfa5MY vms2sjnkrCQ2t/DvthwTV5O23rL44oW3c6K4NapF8uCdNqFvVIrxclZuLojFUUJEFZTuo8U4lptO TloLR/MGNkl3MLxxN+Wm7CEIdfzmYRY/d9XZkZeECmzUAk10wBTt/Tn7g/JeFKEEsAvp/u6P4W4L sgizYWYJarEGOmWWWcDwNf3J2iiNGhGHcIEKqJp1HZ46hgUAntuA1iX53AWeJ1lMdjlb6vmlodiD D9H/3zAR+YXPM0j1ym1kFCx6WE/TSwhJxZVkGmMOeT31s4zKWK2cQkV5bg6HGVxUsWW2v4yb3BPp DW+4LtxnbsmLEbWEFIoAGXCDeZGXkdQaJ783HjIH2BRjPChMrwIDAQABo2MwYTAOBgNVHQ8BAf8E BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUrmwFo5MT4qLn4tcc1sfwf8hnU6AwHwYD VR0jBBgwFoAUrmwFo5MT4qLn4tcc1sfwf8hnU6AwDQYJKoZIhvcNAQEMBQADggIBAIMl7ejR/ZVS zZ7ABKCRaeZc0ITe3K2iT+hHeNZlmKlbqDyHfAKK0W63FnPmX8BUmNV0vsHN4hGRrSMYPd3hckSW tJVewHuOmXgWQxNWV7Oiszu1d9xAcqyj65s1PrEIIaHnxEM3eTK+teecLEy8QymZjjDTrCHg4x36 2AczdlQAIiq5TSAucGja5VP8g1zTnfL/RAxEZvLS471GABptArolXY2hMVHdVEYcTduZlu8aHARc phXveOB5/l3bPqpMVf2aFalv4ab733Aw6cPuQkbtwpMFifp9Y3s/0HGBfADomK4OeDTDJfuvCp8g a907E48SjOJBGkh6c6B3ace2XH+CyB7+WBsoK6hsrV5twAXSe7frgP4lN/4Cm2isQl3D7vXM3PBQ ddI2aZzmewTfbgZptt4KCUhZh+t7FGB6ZKppQ++Rx0zsGN1s71MtjJnhXvJyPs9UyL1n7KQPTEX/ 07kwIwdMjxC/hpbZmVq0mVccpMy7FYlTuiwFD+TEnhmxGDTVTJ267fcfrySVBHioA7vugeXaX3yL SqGQdCWnsz5LyCxWvcfI7zjiXJLwefechLp0LWEBIH5+0fJPB1lfiy1DUutGDJTh9WZHeXfVVFsf rSQ3y0VaTqBESMjYsJnFFYQJ9tZJScBluOYacW6gqPGC6EU+bNYC1wpngwVayaQQMIIGjzCCBHeg AwIBAgIMdI2Nfq/Vk8dzZMUnMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQK ExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIEdDQyBSNiBTTUlNRSBDQSAy MDIzMB4XDTI1MDYyMDEwNTUwNVoXDTI3MDYyMTEwNTUwNVowgdcxCzAJBgNVBAYTAlVTMRMwEQYD VQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEZMBcGA1UEYRMQTlRSVVMrREUtNjYx MDExNzEPMA0GA1UEBBMGU2F4ZW5hMQ4wDAYDVQQqEwVTdW1pdDEWMBQGA1UEChMNQlJPQURDT00g SU5DLjEiMCAGA1UEAwwZc3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTEoMCYGCSqGSIb3DQEJARYZ c3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB ANWfdRsD0NsQr9oaNovE6N6ldgUGyJipSPE9u2SuA5SLtk4//f6PIFdR6h5fMMUsw7H4eBqY88Do ifscJ8gSasrjdgcsGC9lCyPXLwfNEU5C3Mbnua8OK6sTBpf6mvY88HW/6AoKiSpfo5jxCZQOm4Zz oJWD5ea7ThJ2XdDk1rRtGUkwFgN9GRNfOoiIwkkA7EdEfV0eQkVqNgkqUyBSABXcduul2sd4/JQO SsVmTdSKid7L6yZsqk5b3Xj+GMJwPdRfeKP2SRoys0SVnajc9Di+9Jy7uGKxxtb562egZauDFX/0 o0UgYfZrbwWfzJDYMLKzlrOD0M8yGkD8BnyIiVECAwEAAaOCAd0wggHZMA4GA1UdDwEB/wQEAwIF oDAMBgNVHRMBAf8EAjAAMIGTBggrBgEFBQcBAQSBhjCBgzBGBggrBgEFBQcwAoY6aHR0cDovL3Nl Y3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3NnY2NyNnNtaW1lY2EyMDIzLmNydDA5BggrBgEF BQcwAYYtaHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3NnY2NyNnNtaW1lY2EyMDIzMGUGA1Ud IAReMFwwCQYHZ4EMAQUDAzALBgkrBgEEAaAyASgwQgYKKwYBBAGgMgoDAjA0MDIGCCsGAQUFBwIB FiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzBBBgNVHR8EOjA4MDagNKAy hjBodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzZ2NjcjZzbWltZWNhMjAyMy5jcmwwJAYDVR0R BB0wG4EZc3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDBDAfBgNV HSMEGDAWgBQAKTaeXHq6D68tUC3boCOFGLCgkjAdBgNVHQ4EFgQURSmmYGaiq6dg3CEvXQGHEXJF 8xwwDQYJKoZIhvcNAQELBQADggIBAAl0pcCjujKdwmgtiGl2naEY5wB4G601Kuu3032tR7wmgZLg k+lg9fhAA0boPsi1FE1Pwb93YDBGr/naS/oQ9JglSMeEVzeRvCqjFS4FpouBAFHB77c8w3ZwJ3+t FSRJW9SbW0DADBn5t8GAjv2aSm5vDorqFe9MKOYEe50yYDQEUAsEt5QkrLTcEx9ntvVb25MxI8vM bdfqna+/TyCmFmnGAz58jiw5DxLn++6wMmAk0SeUEuMrAlRIyhte6BBSBQ5cL1P+DWSqQbm/pwCq NhySSLNtTi2dKJvvg6Ax9au913KiJj6uZfPlh6/0kaVKM5GhIABUcm3c6g2qD7ITJxB/p1kjYKLa hVrtrjK7000lHKTPFr6MWB4Ggx7yKQ9yIlPMKKF/Lj8FabYCqeM5ovG7kaK8FYXug5vjNjN0nedR X3P8o+8aL6WFIAAAKm2DqZh3252Gcken8v5c+f0SXWSJFvemfFNgrJiQFnFVrOE5v7qwvM/KvVCA dYm4Ph9QYI0sm+Xitx8MkdOJtq5mcPWowGi8UiCgkOidv4ki1SA0wptfquUhbfS9b2M3XUHCEIUX 4ECvIjR3f+E0NbBIfPccWfYUaDLvo2qhLYS3KQbhKdXcJ83ha17mbVNZbDDo9upNcLO/oPyDbCNF J6UpXZmis1wnCynhK4kQfwFhW7H+MYICVzCCAlMCAQEwYjBSMQswCQYDVQQGEwJCRTEZMBcGA1UE ChMQR2xvYmFsU2lnbiBudi1zYTEoMCYGA1UEAxMfR2xvYmFsU2lnbiBHQ0MgUjYgU01JTUUgQ0Eg MjAyMwIMdI2Nfq/Vk8dzZMUnMA0GCWCGSAFlAwQCAQUAoIHHMC8GCSqGSIb3DQEJBDEiBCDQms8Z XTxrmi5NmdHTr/2f37ecfqsquCj0kxnh36uo4zAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwG CSqGSIb3DQEJBTEPFw0yNTEyMDMxNDE1NThaMFwGCSqGSIb3DQEJDzFPME0wCwYJYIZIAWUDBAEq MAsGCWCGSAFlAwQBFjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwCwYJKoZIhvcNAQEHMAsGCWCG SAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQAxxhwYULzDfgYfEMlgQyYZ78Cu0sLkX8YDEHHNDogD ZvBwd4c4K+2l/f2rEeLqjMsQEC6F4D6YzMV2sXNGWMGUx9bgj7U0Z6cDmY7H0AHbc2TFR/z0T2bt /ILFjs3bWE3bb+bHwiK79iQcsU45qqVd/Of9GQeNKq2b2b+0zDsGD8Cp5P8BhREQfB8IlVoSK3j6 YzDEYlYxMxm2am+zAaACar2rl21FSiRdigvQqNaj8UPMjFobcOdaxjy+1qsQ5MAq7Iu2Hd5xwH0w nUTv99gpwe89QbOMWpHLG37Ng7M7BiHkJekEzMkVir4EaZ/W4j6zpKnPgjC2QCFwC4DmzRYb --000000000000e8be5206450cd99a-- From nobody Wed Dec 3 14:30:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM0Rf1GhYz6JTc8; Wed, 03 Dec 2025 14:30:38 +0000 (UTC) (envelope-from markj@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM0Rd5cSNz3JTw; Wed, 03 Dec 2025 14:30:37 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764772237; 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=/EV/rpeymvxyJP7o65rTesvNLxwFHoq+FRjeocIeHWA=; b=JxJ3hhQngDs3UzI5TgVJ7fw3XLclb8lI9tf7UIQgtbPaTlkCbNVqBtSsja9LaScdty177G KJCuNNwMKOTw39Xp9GjP+Uv18E+PFwEtsZdNnsFpZCbJYYGKa0s+Y9zgMjw5ZwUe1YORf8 esqeM+N0uwBTKnW5/MIqFRrknDRwdEpBuExp5jEMrJnVtwWMgAJ3xACmieizhGzObSY/TS I55VeOR51yTol9n7YmP26/i8J7jUmtfh/2iiPJsvjd6JtVOTXGkgrePxnlVRZFQ8g6HU01 TRePkkdPRB4MXNDz+O0qROLlc/VqD8SS2JQ8EtZoVoX0VSYMVGBaP0ELQ5SNtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764772237; 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=/EV/rpeymvxyJP7o65rTesvNLxwFHoq+FRjeocIeHWA=; b=inJNHqqqon6YpzRK1gYWraCAVlDVENPla+aaA1D3pg2apmK2pxqWjpTF3z3GuT3p9+HAmu aXB03kyXsByMOa70R/xTcvZMgvWS1wrjEovSyOB24ovAHYU96Ofu1g2CSC+hmldKX6uTOZ 7JxGBsVn/+DQgr39CuDUG9xtbWVAdcWAFsvDZsbl7I+kWFkIEKBnXpaWtpzFMDjmfa7bBO yfLuSMGfn+2w8Q+MrpYHUckckmAV84FSHSAjNZAkgp91d604rm+6iYVsTo0DLJxl4rd4CI 6sOUbBwOSxq9YiWrbhxIJNENTGH8aDNxzA/PwJ8x9X/uRdA1CF6oKOPICZgVMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764772237; a=rsa-sha256; cv=none; b=OJGvgFiGSJyNaRGGQrTQ4TuiRYoFJwYgPKoPgHUO2oSWCNNqkiQesrJW5R10EnV0F2tshC R/gSpFUB4CF/hPQhAh/pw7fEplm+/IxKDjK3WDKyXartpq3tG46Ej8erbs5LTKo+gBfp9U 1kvaEiVT7mlB48RLBjrdax4SxlPPhkbva4pI/bsfbiu7D+c+Ht+Hh0JBu5MpghNz4ucrQi OML8gQL1zfv3ZYmA3BZJ5YXOrpb1rrCKfyWZkGyn286EvwiKgXK37N+1CixUzzgGSSTHur 6LiWCgP9lxX1RA0+Xkv5YrACMeMndU1GXRyxJBXvb8wV/PYS40oIU+iTCyUakA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from nuc (192-0-220-237.cpe.teksavvy.com [192.0.220.237]) (using TLSv1.3 with cipher TLS_AES_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: markj) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dM0Rd38bzzBct; Wed, 03 Dec 2025 14:30:37 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Wed, 3 Dec 2025 09:30:35 -0500 From: Mark Johnston To: Sumit Saxena Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 35dd53a9e132 - main - librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping Message-ID: References: <69302037.3d155.40084cd7@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69302037.3d155.40084cd7@gitrepo.freebsd.org> On Wed, Dec 03, 2025 at 11:34:15AM +0000, Sumit Saxena wrote: > The branch main has been updated by ssaxena: > > URL: https://cgit.FreeBSD.org/src/commit/?id=35dd53a9e13265f7a479649776453efc5b737a0f > > commit 35dd53a9e13265f7a479649776453efc5b737a0f > Author: Sumit Saxena > AuthorDate: 2025-12-03 11:28:33 +0000 > Commit: Sumit Saxena > CommitDate: 2025-12-03 11:33:40 +0000 > > librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping > > By default ibv_devices and rping are not statically bound to > libbnxtre.so.1. i.e. 'ldd /usr/bin/rping' command doesn't list > 'libbnxtre.so.1' entry. So, statically bound the libbnxtre.so.1 > library to rping & ibv_devices utils. > > MFC-After: 3 days > Reviewed-by: sumit.saxena@broadcom.com > Differential-Revision: https://reviews.freebsd.org/D49604 > --- > share/mk/src.libnames.mk | 7 +++++-- > usr.bin/ofed/libibverbs/Makefile.inc | 2 +- > usr.bin/ofed/librdmacm/Makefile.inc | 2 +- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk > index e108cc15fb55..125fe2242bd5 100644 > --- a/share/mk/src.libnames.mk > +++ b/share/mk/src.libnames.mk > @@ -285,6 +285,7 @@ _LIBRARIES+= \ > irdma \ > mlx4 \ > mlx5 \ > + bnxtre \ > rdmacm \ > osmcomp \ > opensm \ > @@ -360,7 +361,7 @@ _DP_cap_sysctl= nv > _DP_cap_syslog= nv > _DP_crypt= md > .if ${MK_OFED} != "no" > -_DP_pcap= ibverbs mlx5 > +_DP_pcap= ibverbs mlx5 bnxtre It's not clear from the commit message whether this part of the change was intentional. In any case, it breaks the build. Here is a patch which fixes it: https://reviews.freebsd.org/D54048 > .endif > _DP_pjdlog= util > _DP_usb= pthread > @@ -511,11 +512,12 @@ _DP_cxgb4= ibverbs pthread > _DP_ibcm= ibverbs > _DP_ibmad= ibumad > _DP_ibnetdisc= osmcomp ibmad ibumad > -_DP_ibumad= > +_DP_ibumad= > _DP_ibverbs= > _DP_irdma= ibverbs pthread > _DP_mlx4= ibverbs pthread > _DP_mlx5= ibverbs pthread > +_DP_bnxtre= ibverbs pthread > _DP_rdmacm= ibverbs > _DP_osmcomp= pthread > _DP_opensm= pthread > @@ -810,6 +812,7 @@ LIBIBVERBSDIR= ${_LIB_OBJTOP}/lib/ofed/libibverbs > LIBIRDMADIR= ${_LIB_OBJTOP}/lib/ofed/libirdma > LIBMLX4DIR= ${_LIB_OBJTOP}/lib/ofed/libmlx4 > LIBMLX5DIR= ${_LIB_OBJTOP}/lib/ofed/libmlx5 > +LIBBNXTREDIR= ${_LIB_OBJTOP}/lib/ofed/libbnxtre > LIBRDMACMDIR= ${_LIB_OBJTOP}/lib/ofed/librdmacm > LIBOSMCOMPDIR= ${_LIB_OBJTOP}/lib/ofed/complib > LIBOPENSMDIR= ${_LIB_OBJTOP}/lib/ofed/libopensm > diff --git a/usr.bin/ofed/libibverbs/Makefile.inc b/usr.bin/ofed/libibverbs/Makefile.inc > index 616c9bd54707..f8301c3d1073 100644 > --- a/usr.bin/ofed/libibverbs/Makefile.inc > +++ b/usr.bin/ofed/libibverbs/Makefile.inc > @@ -3,6 +3,6 @@ _spath=${SRCTOP}/contrib/ofed/libibverbs > > BINDIR?= /usr/bin > CFLAGS+= -I${_spath} > -LIBADD+= ibverbs mlx4 mlx5 cxgb4 irdma pthread > +LIBADD+= ibverbs mlx4 mlx5 bnxtre cxgb4 irdma pthread > > WARNS?= 2 > diff --git a/usr.bin/ofed/librdmacm/Makefile.inc b/usr.bin/ofed/librdmacm/Makefile.inc > index 74f32fe08b42..66fcf2ac267b 100644 > --- a/usr.bin/ofed/librdmacm/Makefile.inc > +++ b/usr.bin/ofed/librdmacm/Makefile.inc > @@ -3,6 +3,6 @@ _spath=${SRCTOP}/contrib/ofed/librdmacm > > BINDIR?= /usr/bin > CFLAGS+= -I${SRCTOP}/contrib/ofed > -LIBADD+= ibverbs rdmacm irdma mlx4 mlx5 cxgb4 pthread > +LIBADD+= ibverbs rdmacm irdma mlx4 mlx5 bnxtre cxgb4 pthread > > WARNS?= 0 > From nobody Wed Dec 3 14:36:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM0ZZ1pt1z6JVS2 for ; Wed, 03 Dec 2025 14:36:38 +0000 (UTC) (envelope-from sumit.saxena@broadcom.com) Received: from mail-pl1-x663.google.com (mail-pl1-x663.google.com [IPv6:2607:f8b0:4864:20::663]) (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 4dM0ZY6XWvz3LFC for ; Wed, 03 Dec 2025 14:36:37 +0000 (UTC) (envelope-from sumit.saxena@broadcom.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x663.google.com with SMTP id d9443c01a7336-29812589890so81476565ad.3 for ; Wed, 03 Dec 2025 06:36:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764772596; x=1765377396; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5vxsjhzrnn1Tqch+P7EpCHl5KcoXf+7REca6EJVUmp0=; b=KyS9bu6C1GcpBD/OMEO4n0dFl/WBCiEYEnSye7wrvmgt3OyMG10UkYZ+W53J2L0436 uJp7gMzfpbmd4e1hf9LCSWRE+Y996JQ+OYf/+HY09maGQh7Pb9QUfNnV6zmsATKkkyij mGUGK4gBVmIJbszQ89WDlFzIeWwHJ4kXpeEONpxxobuzirm94CTlJ12/j9Fhq9xMccEN m9Axz1hmgOPDvEkvATsGIwod5Cvhf69afMsyXE6qQlPCf7Nh3e45isT9mwMWYKEq0tVi dN6Zj12z0oULyECKbCK6+u3wGvZt2rdw10C1NcK1EkDkdqcA/jKlIuxY3z6qH2/nwThi g8Fg== X-Forwarded-Encrypted: i=1; AJvYcCXB4/vtqG0KhSUJcCBuMg0hU03wUV7Ep9tXZf5MyLH7w5DoGGRmwH4YNcH9Y4rvoBYfXw1yrcAm0lJgb00eBiFwX9aYPw==@freebsd.org X-Gm-Message-State: AOJu0YxSbtG6WVVwQ0s4EhJNfjDa+jbEKpkNFC4OVDUZNZxJ1GiSKUkl 9VYw/4eDLHk/XmwM7F+3yaHkxr4JAWQsSSWEgqs1jRggsjoerq0J+IdmqoEXqti47IOxXZ4H+eD DFcUEQMvpUygArN70acXAOo3ooJozdMkxeVtyFw4yaKeJOU0zMO1h14xrk07qlJ3lgT+nLJ4wbj p7fXcO/4XuvDRP4CZfAz4k/HsxlC4zS/32JkB4zeKQO92IuVvoQT3KiQ3w6q7uYQOvVEINGslMp pKFt/WaWIG4cC/t+y1kTjqi X-Gm-Gg: ASbGncsFFfOnFY1YK1EtEFhPupAsxvmpdx0JNYy7qIFMtiARxL33BP3KnyhKrDUFk1X vwClIWDSN9qnzheTp51w2xYaXjL/F/JzwLlbXbLZSfDcqJXqKYjo+/91XWRY0wrooJLTRrpAnRk QP00+9hFghwsSv3FbWXyz9SkGGhcGN9cKpq5vEAD/X7nFL/31AhCRfRzym/IZjCGNOKROiK7cSf tArcftOYoH00WNlbbZdnX4RGqVHgCrE7dbiTLdemaSeoZoaAWE/0GxU82KaGYgqNXaSz83BY+2T 8m2xygxpZftEeHp9H7y++BNkdCzyC9lxk3LvOQ1zj+d11VpIOLnF6AkMlE5qz4gNOSsmvaaJJPV WiDXgAoGa9D4OG2eK3tPaVHUzul0mRZKlDC2T5nhBag7HQpQ4OQt5CVKg9u0fZnKzsLT6HVodwH vaXcF83NdvcqkGKq4Zc+fSUBU+TjnrpfZeA1y5oBpfuGPybFs= X-Google-Smtp-Source: AGHT+IHmnIvgD9tqeLkNAU1bufzY60eVtFX4xgjHZBxMEFNQtm5W2gqkAQbd0hjUWxoHAL+q0EKcADC69nMU X-Received: by 2002:a17:903:2c05:b0:297:f5ad:6708 with SMTP id d9443c01a7336-29d6844e3a9mr27620445ad.43.1764772595338; Wed, 03 Dec 2025 06:36:35 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-103.dlp.protect.broadcom.com. [144.49.247.103]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-29bce479647sm25491015ad.27.2025.12.03.06.36.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Dec 2025 06:36:35 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-596a25b32edso773483e87.1 for ; Wed, 03 Dec 2025 06:36:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1764772593; x=1765377393; 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=5vxsjhzrnn1Tqch+P7EpCHl5KcoXf+7REca6EJVUmp0=; b=CLKDSfgV3H/ZUSCrKlq1UKS8GKdKi/48q3Bn55b4D5YFkD2JPTvoSGez+wI1yR3gSJ F2+vwKTgJV8b0R9qdYaVEo7zpH+6axwr7rnDrZOx6YRJhpFhy0BVicmB9LbNJc2zy89f qsi7eXBPk9v6ybNClBaLHI/fEREN6COrnIf0k= X-Forwarded-Encrypted: i=1; AJvYcCWAL3Krim39SOpchvs8WajW8Nh2oyoOCi4mtyYEcNI7WDUpL3z66p3j8usaW7NDzr3zOOatHcpm0kpGH5jkYOFy5hYkSw==@freebsd.org X-Received: by 2002:a05:6512:33d4:b0:595:9929:c8a4 with SMTP id 2adb3069b0e04-597cfb3203bmr2676371e87.22.1764772593052; Wed, 03 Dec 2025 06:36:33 -0800 (PST) X-Received: by 2002:a05:6512:33d4:b0:595:9929:c8a4 with SMTP id 2adb3069b0e04-597cfb3203bmr2676358e87.22.1764772592608; Wed, 03 Dec 2025 06:36:32 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <69302037.3d155.40084cd7@gitrepo.freebsd.org> In-Reply-To: From: Sumit Saxena Date: Wed, 3 Dec 2025 20:06:11 +0530 X-Gm-Features: AWmQ_blHQK8CcmxrcS4xGEGHbpuK0x_BoFyzJgEvRWG1hHpPvXpEIwoCFVFa_1Y Message-ID: Subject: Re: git: 35dd53a9e132 - main - librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping To: Mark Johnston Cc: Sumit Saxena , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Sreekanth Reddy X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="0000000000008a92d706450d233b" X-Spamd-Bar: ---- 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-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dM0ZY6XWvz3LFC --0000000000008a92d706450d233b Content-Type: text/plain; charset="UTF-8" > It's not clear from the commit message whether this part of the change > was intentional. In any case, it breaks the build. Here is a patch > which fixes it: https://reviews.freebsd.org/D54048 Thanks Mark for fixing this. Sreekanth / I will rewrite the commit message. Thanks, Sumit --0000000000008a92d706450d233b Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIIVWQYJKoZIhvcNAQcCoIIVSjCCFUYCAQExDzANBglghkgBZQMEAgEFADALBgkqhkiG9w0BBwGg ghLGMIIGqDCCBJCgAwIBAgIQfofDCS7XZu8vIeKo0KeY9DANBgkqhkiG9w0BAQwFADBMMSAwHgYD VQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UE AxMKR2xvYmFsU2lnbjAeFw0yMzA0MTkwMzUzNTNaFw0yOTA0MTkwMDAwMDBaMFIxCzAJBgNVBAYT AkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIEdDQyBS NiBTTUlNRSBDQSAyMDIzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwjAEbSkPcSyn 26Zn9VtoE/xBvzYmNW29bW1pJZ7jrzKwPJm/GakCvy0IIgObMsx9bpFaq30X1kEJZnLUzuE1/hlc hatYqyORVBeHlv5V0QRSXY4faR0dCkIhXhoGknZ2O0bUJithcN1IsEADNizZ1AJIaWsWbQ4tYEYj ytEdvfkxz1WtX3SjtecZR+9wLJLt6HNa4sC//QKdjyfr/NhDCzYrdIzAssoXFnp4t+HcMyQTrj0r pD8KkPj96sy9axzegLbzte7wgTHbWBeJGp0sKg7BAu+G0Rk6teO1yPd75arbCvfY/NaRRQHk6tmG 71gpLdB1ZhP9IcNYyeTKXIgfMh2tVK9DnXGaksYCyi6WisJa1Oa+poUroX2ESXO6o03lVxiA1xyf G8lUzpUNZonGVrUjhG5+MdY16/6b0uKejZCLbgu6HLPvIyqdTb9XqF4XWWKu+OMDs/rWyQ64v3mv Sa0te5Q5tchm4m9K0Pe9LlIKBk/gsgfaOHJDp4hYx4wocDr8DeCZe5d5wCFkxoGc1ckM8ZoMgpUc 4pgkQE5ShxYMmKbPvNRPa5YFzbFtcFn5RMr1Mju8gt8J0c+dxYco2hi7dEW391KKxGhv7MJBcc+0 x3FFTnmhU+5t6+CnkKMlrmzyaoeVryRTvOiH4FnTNHtVKUYDsCM0CLDdMNgoxgkCAwEAAaOCAX4w ggF6MA4GA1UdDwEB/wQEAwIBhjBMBgNVHSUERTBDBggrBgEFBQcDAgYIKwYBBQUHAwQGCisGAQQB gjcUAgIGCisGAQQBgjcKAwwGCisGAQQBgjcKAwQGCSsGAQQBgjcVBjASBgNVHRMBAf8ECDAGAQH/ AgEAMB0GA1UdDgQWBBQAKTaeXHq6D68tUC3boCOFGLCgkjAfBgNVHSMEGDAWgBSubAWjkxPioufi 1xzWx/B/yGdToDB7BggrBgEFBQcBAQRvMG0wLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwMi5nbG9i YWxzaWduLmNvbS9yb290cjYwOwYIKwYBBQUHMAKGL2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5j b20vY2FjZXJ0L3Jvb3QtcjYuY3J0MDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwuZ2xvYmFs c2lnbi5jb20vcm9vdC1yNi5jcmwwEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEBDAUAA4IC AQCRkUdr1aIDRmkNI5jx5ggapGUThq0KcM2dzpMu314mJne8yKVXwzfKBtqbBjbUNMODnBkhvZcn bHUStur2/nt1tP3ee8KyNhYxzv4DkI0NbV93JChXipfsan7YjdfEk5vI2Fq+wpbGALyyWBgfy79Y IgbYWATB158tvEh5UO8kpGpjY95xv+070X3FYuGyeZyIvao26mN872FuxRxYhNLwGHIy38N9ASa1 Q3BTNKSrHrZngadofHglG5W3TMFR11JOEOAUHhUgpbVVvgCYgGA6dSX0y5z7k3rXVyjFOs7KBSXr dJPKadpl4vqYphH7+P40nzBRcxJHrv5FeXlTrb+drjyXNjZSCmzfkOuCqPspBuJ7vab0/9oeNERg nz6SLCjLKcDXbMbKcRXgNhFBlzN4OUBqieSBXk80w2Nzx12KvNj758WavxOsXIbX0Zxwo1h3uw75 AI2v8qwFWXNclO8qW2VXoq6kihWpeiuvDmFfSAwRLxwwIjgUuzG9SaQ+pOomuaC7QTKWMI0hL0b4 mEPq9GsPPQq1UmwkcYFJ/Z4I93DZuKcXmKMmuANTS6wxwIEw8Q5MQ6y9fbJxGEOgOgYL4QIqNULb 5CYPnt2LeiIiEnh8Uuh8tawqSjnR0h7Bv5q4mgo3L1Z9QQuexUntWD96t4o0q1jXWLyrpgP7Zcnu CzCCBYMwggNroAMCAQICDkXmuwODM8OFZUjm/0VRMA0GCSqGSIb3DQEBDAUAMEwxIDAeBgNVBAsT F0dsb2JhbFNpZ24gUm9vdCBDQSAtIFI2MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpH bG9iYWxTaWduMB4XDTE0MTIxMDAwMDAwMFoXDTM0MTIxMDAwMDAwMFowTDEgMB4GA1UECxMXR2xv YmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh bFNpZ24wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCVB+hzymb57BTKezz3DQjxtEUL LIK0SMbrWzyug7hBkjMUpG9/6SrMxrCIa8W2idHGsv8UzlEUIexK3RtaxtaH7k06FQbtZGYLkoDK RN5zlE7zp4l/T3hjCMgSUG1CZi9NuXkoTVIaihqAtxmBDn7EirxkTCEcQ2jXPTyKxbJm1ZCatzEG xb7ibTIGph75ueuqo7i/voJjUNDwGInf5A959eqiHyrScC5757yTu21T4kh8jBAHOP9msndhfuDq jDyqtKT285VKEgdt/Yyyic/QoGF3yFh0sNQjOvddOsqi250J3l1ELZDxgc1Xkvp+vFAEYzTfa5MY vms2sjnkrCQ2t/DvthwTV5O23rL44oW3c6K4NapF8uCdNqFvVIrxclZuLojFUUJEFZTuo8U4lptO TloLR/MGNkl3MLxxN+Wm7CEIdfzmYRY/d9XZkZeECmzUAk10wBTt/Tn7g/JeFKEEsAvp/u6P4W4L sgizYWYJarEGOmWWWcDwNf3J2iiNGhGHcIEKqJp1HZ46hgUAntuA1iX53AWeJ1lMdjlb6vmlodiD D9H/3zAR+YXPM0j1ym1kFCx6WE/TSwhJxZVkGmMOeT31s4zKWK2cQkV5bg6HGVxUsWW2v4yb3BPp DW+4LtxnbsmLEbWEFIoAGXCDeZGXkdQaJ783HjIH2BRjPChMrwIDAQABo2MwYTAOBgNVHQ8BAf8E BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUrmwFo5MT4qLn4tcc1sfwf8hnU6AwHwYD VR0jBBgwFoAUrmwFo5MT4qLn4tcc1sfwf8hnU6AwDQYJKoZIhvcNAQEMBQADggIBAIMl7ejR/ZVS zZ7ABKCRaeZc0ITe3K2iT+hHeNZlmKlbqDyHfAKK0W63FnPmX8BUmNV0vsHN4hGRrSMYPd3hckSW tJVewHuOmXgWQxNWV7Oiszu1d9xAcqyj65s1PrEIIaHnxEM3eTK+teecLEy8QymZjjDTrCHg4x36 2AczdlQAIiq5TSAucGja5VP8g1zTnfL/RAxEZvLS471GABptArolXY2hMVHdVEYcTduZlu8aHARc phXveOB5/l3bPqpMVf2aFalv4ab733Aw6cPuQkbtwpMFifp9Y3s/0HGBfADomK4OeDTDJfuvCp8g a907E48SjOJBGkh6c6B3ace2XH+CyB7+WBsoK6hsrV5twAXSe7frgP4lN/4Cm2isQl3D7vXM3PBQ ddI2aZzmewTfbgZptt4KCUhZh+t7FGB6ZKppQ++Rx0zsGN1s71MtjJnhXvJyPs9UyL1n7KQPTEX/ 07kwIwdMjxC/hpbZmVq0mVccpMy7FYlTuiwFD+TEnhmxGDTVTJ267fcfrySVBHioA7vugeXaX3yL SqGQdCWnsz5LyCxWvcfI7zjiXJLwefechLp0LWEBIH5+0fJPB1lfiy1DUutGDJTh9WZHeXfVVFsf rSQ3y0VaTqBESMjYsJnFFYQJ9tZJScBluOYacW6gqPGC6EU+bNYC1wpngwVayaQQMIIGjzCCBHeg AwIBAgIMdI2Nfq/Vk8dzZMUnMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQK ExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIEdDQyBSNiBTTUlNRSBDQSAy MDIzMB4XDTI1MDYyMDEwNTUwNVoXDTI3MDYyMTEwNTUwNVowgdcxCzAJBgNVBAYTAlVTMRMwEQYD VQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEZMBcGA1UEYRMQTlRSVVMrREUtNjYx MDExNzEPMA0GA1UEBBMGU2F4ZW5hMQ4wDAYDVQQqEwVTdW1pdDEWMBQGA1UEChMNQlJPQURDT00g SU5DLjEiMCAGA1UEAwwZc3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTEoMCYGCSqGSIb3DQEJARYZ c3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB ANWfdRsD0NsQr9oaNovE6N6ldgUGyJipSPE9u2SuA5SLtk4//f6PIFdR6h5fMMUsw7H4eBqY88Do ifscJ8gSasrjdgcsGC9lCyPXLwfNEU5C3Mbnua8OK6sTBpf6mvY88HW/6AoKiSpfo5jxCZQOm4Zz oJWD5ea7ThJ2XdDk1rRtGUkwFgN9GRNfOoiIwkkA7EdEfV0eQkVqNgkqUyBSABXcduul2sd4/JQO SsVmTdSKid7L6yZsqk5b3Xj+GMJwPdRfeKP2SRoys0SVnajc9Di+9Jy7uGKxxtb562egZauDFX/0 o0UgYfZrbwWfzJDYMLKzlrOD0M8yGkD8BnyIiVECAwEAAaOCAd0wggHZMA4GA1UdDwEB/wQEAwIF oDAMBgNVHRMBAf8EAjAAMIGTBggrBgEFBQcBAQSBhjCBgzBGBggrBgEFBQcwAoY6aHR0cDovL3Nl Y3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3NnY2NyNnNtaW1lY2EyMDIzLmNydDA5BggrBgEF BQcwAYYtaHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3NnY2NyNnNtaW1lY2EyMDIzMGUGA1Ud IAReMFwwCQYHZ4EMAQUDAzALBgkrBgEEAaAyASgwQgYKKwYBBAGgMgoDAjA0MDIGCCsGAQUFBwIB FiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzBBBgNVHR8EOjA4MDagNKAy hjBodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzZ2NjcjZzbWltZWNhMjAyMy5jcmwwJAYDVR0R BB0wG4EZc3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDBDAfBgNV HSMEGDAWgBQAKTaeXHq6D68tUC3boCOFGLCgkjAdBgNVHQ4EFgQURSmmYGaiq6dg3CEvXQGHEXJF 8xwwDQYJKoZIhvcNAQELBQADggIBAAl0pcCjujKdwmgtiGl2naEY5wB4G601Kuu3032tR7wmgZLg k+lg9fhAA0boPsi1FE1Pwb93YDBGr/naS/oQ9JglSMeEVzeRvCqjFS4FpouBAFHB77c8w3ZwJ3+t FSRJW9SbW0DADBn5t8GAjv2aSm5vDorqFe9MKOYEe50yYDQEUAsEt5QkrLTcEx9ntvVb25MxI8vM bdfqna+/TyCmFmnGAz58jiw5DxLn++6wMmAk0SeUEuMrAlRIyhte6BBSBQ5cL1P+DWSqQbm/pwCq NhySSLNtTi2dKJvvg6Ax9au913KiJj6uZfPlh6/0kaVKM5GhIABUcm3c6g2qD7ITJxB/p1kjYKLa hVrtrjK7000lHKTPFr6MWB4Ggx7yKQ9yIlPMKKF/Lj8FabYCqeM5ovG7kaK8FYXug5vjNjN0nedR X3P8o+8aL6WFIAAAKm2DqZh3252Gcken8v5c+f0SXWSJFvemfFNgrJiQFnFVrOE5v7qwvM/KvVCA dYm4Ph9QYI0sm+Xitx8MkdOJtq5mcPWowGi8UiCgkOidv4ki1SA0wptfquUhbfS9b2M3XUHCEIUX 4ECvIjR3f+E0NbBIfPccWfYUaDLvo2qhLYS3KQbhKdXcJ83ha17mbVNZbDDo9upNcLO/oPyDbCNF J6UpXZmis1wnCynhK4kQfwFhW7H+MYICVzCCAlMCAQEwYjBSMQswCQYDVQQGEwJCRTEZMBcGA1UE ChMQR2xvYmFsU2lnbiBudi1zYTEoMCYGA1UEAxMfR2xvYmFsU2lnbiBHQ0MgUjYgU01JTUUgQ0Eg MjAyMwIMdI2Nfq/Vk8dzZMUnMA0GCWCGSAFlAwQCAQUAoIHHMC8GCSqGSIb3DQEJBDEiBCDUd7Uo JOyPRTCy38GTz5C3SbGreIL1vT4zTjcU6Vv6KzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwG CSqGSIb3DQEJBTEPFw0yNTEyMDMxNDM2MzNaMFwGCSqGSIb3DQEJDzFPME0wCwYJYIZIAWUDBAEq MAsGCWCGSAFlAwQBFjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwCwYJKoZIhvcNAQEHMAsGCWCG SAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQBUhzlXBRRHaL265CyqfDkikOy0/Ml+fDVov/+qeMYp 06e8fLrKAMfNgMwlQYUb/nkKZJ8xTWZetbbDkeLrZXACn/FJR1Mzm0eD4+1JddAX/ZiR8LITx4fo Q5yUCzYNRsboF++beNWRM9q7MNsr+tNhdMl5N7p3HrkRFY1tY+AknsfPRrlpAxYc1GrQcutAEXjW gCIi+tdaq/EAGXho0W07tx+kq2HxtiIEWK02eRIMTUzwRU+K6PwFht1xpJ1B1Tw27cEjn6o/NL0R do5KoSBcgNDJTcIUp3T2KFcfhD87QlC3DGfdp3yhylm5Ac6KpiKZZMAHYcSwi8PQ4OUh4sTm --0000000000008a92d706450d233b-- From nobody Wed Dec 3 14:42:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM0jK3PbCz6JW6Q; Wed, 03 Dec 2025 14:42:29 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM0jK02Sjz3Nlr; Wed, 03 Dec 2025 14:42:28 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003b.ext.cloudfilter.net ([10.228.9.157]) by cmsmtp with ESMTPS id QkefvQ9SWPzKyQo3ovgYhy; Wed, 03 Dec 2025 14:42:28 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id Qo3mvhHQW24TSQo3nv44CA; Wed, 03 Dec 2025 14:42:28 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=Ie+KmGqa c=1 sm=1 tr=0 ts=69304c54 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=wP3pNCr1ah4A:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=obCaeL__CDefsm4fRFAA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 925344D1; Wed, 03 Dec 2025 06:42:26 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 89CC91E9; Wed, 03 Dec 2025 06:42:26 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Sumit Saxena cc: Cy Schubert , Sumit Saxena , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 35dd53a9e132 - main - librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping In-reply-to: References: <69302037.3d155.40084cd7@gitrepo.freebsd.org> <20251203140554.150B71E8@slippy.cwsent.com> Comments: In-reply-to Sumit Saxena message dated "Wed, 03 Dec 2025 19:45:37 +0530." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 03 Dec 2025 06:42:26 -0800 Message-Id: <20251203144226.89CC91E9@slippy.cwsent.com> X-CMAE-Envelope: MS4xfKMo5gNNLzAdFJvp7W7j2Zbw8linxf1BNa1Pg0MOBqaZ1b0pFRcz1FBboV5R9Zix9JyW7gCZFeN/fdNqh3DiVbyzuwZe3ST37wWVgN0y6k+if52aDBAX LhN8T6+DDjIdbsgZCF2nQXUSNJ1eJssYwN/J1LbtthVEpycmlVjPZHRCVZO+i2QLyFbUy1bsFZ/IrROwcgK86Zz8p7VMpWPKsOCwgBEXWEm7Pnzv1UEIPRxF irsH1VAaODnZe+zw7x5si0R1qUqKqYM0TbNRUd8ubvB9cCejutxKsTKcBkh1x2ZuF5Nkr07qfqkQUpfTJprU32oqoVe/zIJ/C7NxMbnS3AI02lHbwKm81x/f 08CH4bcU60/i0yQOkxpw3vRFZg1HEw== X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dM0jK02Sjz3Nlr In message > Content-Type: text/plain; charset="UTF-8" > > My name is inadvertently listed as the 'Author' in the commit message. I am > the reviewer and committer for this patch. > The correct author is captured in the review link: > https://reviews.freebsd.org/D49604 (https://reviews.freebsd.org/D49604). One would apply the author's name and email address using the --author keyword. > > Thanks, > Sumit > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Wed Dec 3 14:43:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM0kY4lMtz6JW8T for ; Wed, 03 Dec 2025 14:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM0kY3sNLz3PVc for ; Wed, 03 Dec 2025 14:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOm+6qXgTwLrMQFImqbKKAcXv7FfO5u3XDv1Us9Gp/g=; b=tU7s2mJaqlVScYgaR5WptZ0A6eme2HtLxNG/qxjHsQ7emRKRXgO0it8x16Ie0DRtcmHc5X VVrOSSwD1+zQxmcuyKPwz9OSjFcWHCK3836HQCHpsQGPWLz7D+SBkCuxynZoKMMkzCi7aP MwJxH6kGnFw25Rm4SwY0kKwSIPr+/XwaAOo+T9tcxP29bonZPTH0zdagi8Z+hlitL4MH1H GSe3rrSeq+grfNtFX7RsF8pbw3OO05un1+aNb22Tpi3lMf+JaRQJ6TXd201IeducOTwWNt tQlXFWd9hKU3BCtz20RIqwS2X1d4LTRmZ4a/mEjVHdGv/tUF+Wh7LVhLj8aDSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOm+6qXgTwLrMQFImqbKKAcXv7FfO5u3XDv1Us9Gp/g=; b=uN7OXe4pf4YmP/+BqTeSHBrJzi1gO5x+GL4T8aB/IqvRLgyHG+SRso7w76Po3Q0iKBYC6A 4+sMWugfxwmDKmxH3YIn/Qb74pqRjD5Z9UTK9WpRM49EB6Tp4VwniCitexhK0OFkmpVAjj TIZtU5/BaofrUWPt39/EoAp+PSUbEHoZK0r9vTjJ/rjJ/4cL5OKadnsQFCdIolIdsBCiw+ zcp4IuMehPkkwKB0P+LHMu1pjt6zNLF7GLI4JLq8nAW6kk3hQZWtcXeY9wzC8NFH59sPfY cC83MjpJ5waDodjAJ7rbrx2T/BOV7vz91KXx5us8yL0PenJtm9w9mmZECJPVdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764773013; a=rsa-sha256; cv=none; b=IOb6lWCl0kap/fJOs/+VGJuCGH3At2q74+uhAulPRfDgLd5xp13oIg6F3CUyfsoGLsPSkT hHwLouu8DjR9YnE7Gznpdb+5y+ghofUYvKV2BW2u6P77oEQ89NFlaxC7EKX+chD6sChKlv PgwKSaWB+kaPwIhxMLl/EDQU5LO5wzyhQGJquf+SbB9262DrUl1xTtBvJrR+QCykjMzQ0+ MVxgq8+xbrQ6OJYA/e+ekFj7ImjDMDXGHEEON9oLPVQE0wNMdPOZTLJXRzw03DeZUoz3Pq rwaXlNCFpF3BkIwAFMhj0i16+ohiYbDzTc1qGI+rn2rOCng/3ONhT4Esanc7rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM0kY3GYdzhk7 for ; Wed, 03 Dec 2025 14:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2b636 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 14:43:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 20a0a2f8f36f - main - riscv/pmap: Handle superpages in pmap_extract_and_hold() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20a0a2f8f36f5db704b674106fa61d8d95b6b071 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 14:43:33 +0000 Message-Id: <69304c95.2b636.575d86af@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=20a0a2f8f36f5db704b674106fa61d8d95b6b071 commit 20a0a2f8f36f5db704b674106fa61d8d95b6b071 Author: Mark Johnston AuthorDate: 2025-12-03 13:41:30 +0000 Commit: Mark Johnston CommitDate: 2025-12-03 13:41:30 +0000 riscv/pmap: Handle superpages in pmap_extract_and_hold() Without this change, vm_fault_quick_hold_pages() falls back to the slow fault handler when it encounters a superpage mapping. Reviewed by: alc, kib Reported and tested by: br MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54022 --- sys/riscv/riscv/pmap.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 26efaecc64d1..0deb8b93a6dc 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -1134,19 +1134,29 @@ pmap_extract(pmap_t pmap, vm_offset_t va) vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { + pd_entry_t *l2p, l2; pt_entry_t *l3p, l3; vm_page_t m; m = NULL; PMAP_LOCK(pmap); - l3p = pmap_l3(pmap, va); - if (l3p != NULL && (l3 = pmap_load(l3p)) != 0) { - if ((l3 & PTE_W) != 0 || (prot & VM_PROT_WRITE) == 0) { - m = PTE_TO_VM_PAGE(l3); - if (!vm_page_wire_mapped(m)) - m = NULL; + l2p = pmap_l2(pmap, va); + if (l2p == NULL || ((l2 = pmap_load(l2p)) & PTE_V) == 0) { + ; + } else if ((l2 & PTE_RWX) != 0) { + if ((l2 & PTE_W) != 0 || (prot & VM_PROT_WRITE) == 0) { + m = PHYS_TO_VM_PAGE(L2PTE_TO_PHYS(l2) + + (va & L2_OFFSET)); + } + } else { + l3p = pmap_l2_to_l3(l2p, va); + if ((l3 = pmap_load(l3p)) != 0) { + if ((l3 & PTE_W) != 0 || (prot & VM_PROT_WRITE) == 0) + m = PTE_TO_VM_PAGE(l3); } } + if (m != NULL && !vm_page_wire_mapped(m)) + m = NULL; PMAP_UNLOCK(pmap); return (m); } From nobody Wed Dec 3 14:43:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM0kZ6lF1z6JW1v for ; Wed, 03 Dec 2025 14:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM0kZ4D5lz3PSX for ; Wed, 03 Dec 2025 14:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5RwiEkwVryWGUtASb2cCFseUt6YVWSRuV3nD4ZeonM=; b=KjXFKDXeLXRZ0RuiO6NLJRt+v2XBk/CJqgVfaC4diG34X/Pdwy0+Zzg7msfqfxor8p7DLG c8gArZC0G+tsGDrDyOo+h9iORlE7huaSBy0tJfWRH2JfDWj8dXf1mdq5AVSMsTtk6tT/QC vtTzQZiDemOl9WKXv7WRkZIg9r5VOAORUtWxNfAQW6EzdAJ4qomZa19nOmYTDq2nYs3J7t 9waMqmMfsDXfB9Allwwi4FBYBNlJV73hPIzDzmzgexV8c8YEGwScSYWypAdoTf+aHTtH5d E3hgh75qnrmfGN6Epl6EUYxnO7nje/f98zS2ry6JEc4cKxmlBd/S/bNc9vZuSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5RwiEkwVryWGUtASb2cCFseUt6YVWSRuV3nD4ZeonM=; b=ZTwKuaiwmyR2WPSEtkNV+7HdCusDnfiEtF2ZpIFZrfGz2YuQyJDGbifpKZGT8FWjrsDVNy fwGz5V3fw47K7FFd0QfMmXWt8JoCKcrJS4a2NeNSsfF/kRiT14gH2+V4CFgIOFWpdRbw5c VKPHLmg7wTrPcMYfJB0rVxmWt9/0fvdxHqJeJodaRPrzTlOyfA+TvaP+ateyF1WIQAjWpS 1APYHJwhiSu8NU9UnThyLd92AwLBZYOx3pQzLwwnKJfxl2nXed9cr/p2kGZd8Nm/ghFMB7 nwt/Ohs0a/KzmBvnWIJIXfySKwX+96h0zzifDoOFfbN9q/x64YGZKEMOf6yU0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764773014; a=rsa-sha256; cv=none; b=d6k8AnV4KqQDZUijhczzijapBN5rNffxhXfFLZjwjBH2QVUQh+pLKq09kyBjd+R2rC8D1G m05aJsSLHO8FzZWlwAJbTuuMpOZ/aO06sULBRu3xMgpm3drY6ssD5nP5aMyZuGkQMWcteT zuFj13T//XIpKDFL+d1MOdGzbqNPs3UZ0yauFVqpTAQcRagqzzAMebtnU8jpRRy7OV6RPy NHA6gmkeUHFU1wex00SC+VaD7ozcKyf37MbaIe9vokfWHa7wKrPHBBpAXtg0KoXPaKxKbR BwgW3F5LF9qsmuKAVH6rzWqkwS0g3x+CHleSfDd1eOKKDJgk2EVuhZ8pop/RXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM0kZ3qB6zj4D for ; Wed, 03 Dec 2025 14:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2abaa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 14:43:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 74f7e916211a - main - divert: Use CK_SLISTs for the divcb hash table List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74f7e916211acafd10af05efd893ccbac1881119 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 14:43:34 +0000 Message-Id: <69304c96.2abaa.24faa50f@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=74f7e916211acafd10af05efd893ccbac1881119 commit 74f7e916211acafd10af05efd893ccbac1881119 Author: Mark Johnston AuthorDate: 2025-12-03 13:43:04 +0000 Commit: Mark Johnston CommitDate: 2025-12-03 13:43:04 +0000 divert: Use CK_SLISTs for the divcb hash table The hash table is accessed in ip_divert_packet(), and there the accesses are synchronized only by the net epoch, so plain SLIST is not safe. Reviewed by: ae MFC after: 1 week Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54011 --- sys/netinet/ip_divert.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index a88497a71019..9f1d862a0531 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -34,6 +34,7 @@ #include "opt_sctp.h" #include +#include #include #include #include @@ -136,7 +137,7 @@ static int div_output_outbound(int family, struct socket *so, struct mbuf *m); struct divcb { union { - SLIST_ENTRY(divcb) dcb_next; + CK_SLIST_ENTRY(divcb) dcb_next; intptr_t dcb_bound; #define DCB_UNBOUND ((intptr_t)-1) }; @@ -146,7 +147,7 @@ struct divcb { struct epoch_context dcb_epochctx; }; -SLIST_HEAD(divhashhead, divcb); +CK_SLIST_HEAD(divhashhead, divcb); VNET_DEFINE_STATIC(struct divhashhead, divhash[DIVHASHSIZE]) = {}; #define V_divhash VNET(divhash) @@ -272,7 +273,7 @@ divert_packet(struct mbuf *m, bool incoming) } /* Put packet on socket queue, if any */ - SLIST_FOREACH(dcb, &V_divhash[DIVHASH(nport)], dcb_next) + CK_SLIST_FOREACH(dcb, &V_divhash[DIVHASH(nport)], dcb_next) if (dcb->dcb_port == nport) break; @@ -600,7 +601,7 @@ div_detach(struct socket *so) so->so_pcb = NULL; DIVERT_LOCK(); if (dcb->dcb_bound != DCB_UNBOUND) - SLIST_REMOVE(&V_divhash[DCBHASH(dcb)], dcb, divcb, dcb_next); + CK_SLIST_REMOVE(&V_divhash[DCBHASH(dcb)], dcb, divcb, dcb_next); V_dcb_count--; V_dcb_gencnt++; DIVERT_UNLOCK(); @@ -619,16 +620,16 @@ div_bind(struct socket *so, struct sockaddr *nam, struct thread *td) return EINVAL; port = ((struct sockaddr_in *)nam)->sin_port; DIVERT_LOCK(); - SLIST_FOREACH(dcb, &V_divhash[DIVHASH(port)], dcb_next) + CK_SLIST_FOREACH(dcb, &V_divhash[DIVHASH(port)], dcb_next) if (dcb->dcb_port == port) { DIVERT_UNLOCK(); return (EADDRINUSE); } dcb = so->so_pcb; if (dcb->dcb_bound != DCB_UNBOUND) - SLIST_REMOVE(&V_divhash[DCBHASH(dcb)], dcb, divcb, dcb_next); + CK_SLIST_REMOVE(&V_divhash[DCBHASH(dcb)], dcb, divcb, dcb_next); dcb->dcb_port = port; - SLIST_INSERT_HEAD(&V_divhash[DIVHASH(port)], dcb, dcb_next); + CK_SLIST_INSERT_HEAD(&V_divhash[DIVHASH(port)], dcb, dcb_next); DIVERT_UNLOCK(); return (0); @@ -667,7 +668,7 @@ div_pcblist(SYSCTL_HANDLER_ARGS) DIVERT_LOCK(); for (int i = 0; i < DIVHASHSIZE; i++) - SLIST_FOREACH(dcb, &V_divhash[i], dcb_next) { + CK_SLIST_FOREACH(dcb, &V_divhash[i], dcb_next) { if (dcb->dcb_gencnt <= xig.xig_gen) { struct xinpcb xi; From nobody Wed Dec 3 14:43:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM0kb61t8z6JW3l for ; Wed, 03 Dec 2025 14:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM0kb52jNz3PSb for ; Wed, 03 Dec 2025 14:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TLvKt8z40UE9cov04sTKBk4FqK74kvkQojjZIyOX7VU=; b=gY5vUnWbJECnpDIQt3AgLUcvd+wghGqkuEeqqIEsIqATuxFV7cs+IBr69zHotBbYpS3svI ZG5AIDt+KUr/42CKwmxjlbAbjK6GmyOELMvDQyNfxOSF5+vXz5Q0OjEihLLLV3M1l7MHaP MJjgk/QNQjkdRgz1USWTNbSJduOc0GCbgab2jl24r9sC4NJAJevjbiK31Buy0Ch53XavzI JtfKX3LEBNIFTOl5xJYRBuXzwxjRU9KcxqdAtm7YzM2bwm5l9b4RFoLrk9yQLGW07me8Rx nbVdUE/qQZoIJBif7hV01wrjLVquGVg54VpU6SX9XsO/1KfwsmR55WZxsayniQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TLvKt8z40UE9cov04sTKBk4FqK74kvkQojjZIyOX7VU=; b=UaKYSSGKuCARLLDBZqveLXhe8Nqx1f9Oe74yR286aVppdslUMrtGOsHR/Nc8Y5mb+DuQt6 NbHnCZn5tFjbz3JlZJzSKTXLTiEL+uPG5yaBVe5y3bM9s4equ0bwBF7hJt8mCkOttMCZgM RA3akRzEPqhKwJCMjutBK3XjYtRbp12WSrZpjK5nWtZO+fXLLIF/HKdejNqPyV/ySHjDXF Js/TdBOU7xWce0CfuEtUwEsjWXf714e9e72choaq4TQjch5Vj/lvXUw2buJJpi+pHfZp1Y Y6klAT0pW/JvfdBqEiUUEVpavtUFa5hm7KwLaB3teCXdNTQjU9LPswDynPwyJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764773015; a=rsa-sha256; cv=none; b=TDUK6Mb5BQR2fhOIuGRjsO6pBVo3XcnIH2n4gPlB1QuixWKGMW2FSET7CNLIaXkDYR7eOW wkjF2PXEDtfS3HlIR/xjorsTuGhynQKdcgJSBr+dTToowPcwU55c8QHHUAlawyNL/0yS7e pUBWt/Vfh7F/9ABEV7qRJfEalNCaokp3VZchn36qqibMXPEI0k4VBuGAUPZn9g7Zqr8W2x cGM6zuESXzyPDF1hPeNWN3lV0ujPEdDnAh0NBMzhOZmZs3zl4RE57/ue/u0IjFbeYt1Kgx QA2jMLuWcG4wqQfVwU3DefujDranXwyGFLDzAy2Ocvek6E8fb3fh36qUa5z3JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM0kb4ZvVzhBs for ; Wed, 03 Dec 2025 14:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 28778 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 14:43:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 962ad7c1984d - main - ofed: Define SUBDIR_DEPEND_libbnxtre List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 962ad7c1984decda1f16b079cd09ca9310e7f7ce Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 14:43:35 +0000 Message-Id: <69304c97.28778.2e7e7ee8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=962ad7c1984decda1f16b079cd09ca9310e7f7ce commit 962ad7c1984decda1f16b079cd09ca9310e7f7ce Author: Mark Johnston AuthorDate: 2025-12-03 14:21:07 +0000 Commit: Mark Johnston CommitDate: 2025-12-03 14:21:07 +0000 ofed: Define SUBDIR_DEPEND_libbnxtre Fixes: b42fda6be3fd ("share/mk: Include libbnxtre entry in bsd.libnames.mk") --- lib/ofed/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ofed/Makefile b/lib/ofed/Makefile index 5421e2e43cd1..a3265813f7d2 100644 --- a/lib/ofed/Makefile +++ b/lib/ofed/Makefile @@ -19,6 +19,7 @@ SUBDIR_DEPEND_libibcm= libibverbs SUBDIR_DEPEND_librdmacm= libibverbs SUBDIR_DEPEND_libibmad= libibumad SUBDIR_DEPEND_libvendor= libibumad +SUBDIR_DEPEND_libbnxtre= libibverbs SUBDIR_DEPEND_libcxgb4= libibverbs SUBDIR_DEPEND_libmlx4= libibverbs SUBDIR_DEPEND_libmlx5= libibverbs From nobody Wed Dec 3 14:43:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM0kd1BRDz6JW3r for ; Wed, 03 Dec 2025 14:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM0kc5gtHz3PNS for ; Wed, 03 Dec 2025 14:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=paS6yOKy6EZv+WAlCJ/0iAc6prqiKKgTanlzQYYL5uM=; b=dWCTKXyCxwnBcTyQ3uTjvLH+dmBXmM2mKu/elo/3TfvZBdDqyNLUBp4lKY9lzuQGWnr5qs Gn86S9utk0CChexEQIOwVplLfbG5/Cu/J7xSpdddFkB2aMHXw/pGgrudZA6lS+A/su7eIs BcPcd0OrjOG3UgHDdDUHPVHu3gPFqKon5CCJblFowAhyXRsGNmyOu/wsxRO6jADl/ly8Cr 75nJH0VFhpeS6nvmgYxB3uBk9I+P3Ii/z5a/LwfV5NJj7UDVQJKP+DwWACUZGz85vPMJbX cqxS6YrV6VW/yYFcEnNPrZk+0ri+KUuzei91sRZ8mJOQ2zQ9ESeIix0AFrQFDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=paS6yOKy6EZv+WAlCJ/0iAc6prqiKKgTanlzQYYL5uM=; b=QpsapVGqEBT5zscV72u6CHocduMo6/rG9ErmtESeYHcT1SKS4bhFCPUVGmxw873AwtDAEo YhQushy+8pT8UZKQ/H7VA1eMyv/8xYv8CUuGYGy2uStJRCw6FjgKX6q0SKXLw95eFiKF3N qWWAp8FNpgXFaSw4z8vN5LgVlVYQgKkDdlecFirTSEbf7TQVZwvx/iU35vRuZAlhKQxaSw 8L8jOBiSJMX2LS0e+qM77QMyrE2Zv+VLCgCwoUsmR1MfF3nsPJIqMRnyDh+GI+g+ikRXOL ok1qjo12KLpVdzXtI9a0ZAWIev/p5xpyJzkoU/NYvLUsAZZZFcOEmRdZ4/dFtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764773016; a=rsa-sha256; cv=none; b=NdqIKNdQlrvL0AjViwK/IcBGm5aAPaFRmglGLSI/Z9ttaEPBH0rMAsm/upTF8YdWROaHLE 4ORd59V3g9EZOQsLlrwifEkHEMogzI0XXL3GM5KA7LyCr2gVT8t7IODzNEgVLasN2XhZh+ GZPfmom0OKnH8R9rZKusi5M2JEVJKB0kJxWYNSmg0AcwTMM7Wguy3q0IfAKrcaclR35lxT /3rB75/ixAngJ/uLoE6O/dDmv41JF3u89QNgT36y6r57CxPbXM7pdITWP9Pm2X82c2tEtS X2XrNTtV5fZB4Wrlk334bp5VVPhQnlVG+Yu9Rbrk3lhVapYq4gDqKdi5xgOXYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM0kc51DBzj4F for ; Wed, 03 Dec 2025 14:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2877d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 14:43:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 73e8fe62466a - main - libpcap: Fix dependency definitions for libpcap List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73e8fe62466a8ae5576473d9be4c6df9a6eedab0 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 14:43:36 +0000 Message-Id: <69304c98.2877d.39b4a14e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=73e8fe62466a8ae5576473d9be4c6df9a6eedab0 commit 73e8fe62466a8ae5576473d9be4c6df9a6eedab0 Author: Mark Johnston AuthorDate: 2025-12-03 14:26:50 +0000 Commit: Mark Johnston CommitDate: 2025-12-03 14:33:53 +0000 libpcap: Fix dependency definitions for libpcap Commit 35dd53a9e132 ("librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping") causes a build failure, since src.libnames.mk declares a depencency on libbnxtre.so, but the libpcap Makefile and prebuild lib dependencies were not updated accordingly. Fix the declarations. Fixes: 35dd53a9e132 ("librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping") Reviewed by: ssaxena Differential Revision: https://reviews.freebsd.org/D54048 --- Makefile.inc1 | 2 ++ lib/libpcap/Makefile | 1 + 2 files changed, 3 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1d617601ece2..0f1e66a89da8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3358,10 +3358,12 @@ _prebuild_libs+= \ lib/ofed/libibmad \ lib/ofed/libibumad \ lib/ofed/complib \ + lib/ofed/libbnxtre \ lib/ofed/libmlx5 lib/ofed/libibmad__L: lib/ofed/libibumad__L lib/ofed/complib__L: lib/libthr__L +lib/ofed/libbnxt__L: lib/ofed/libibverbs__L lib/libthr__L lib/ofed/libmlx5__L: lib/ofed/libibverbs__L lib/libthr__L .endif diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index c4bd175b502a..7f8d8e65d79c 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -151,6 +151,7 @@ CFLAGS+= -DPCAP_SUPPORT_NETMAP .if ${MK_OFED} != "no" SRCS+= pcap-rdmasniff.c LIBADD+= ibverbs +LIBADD+= bnxtre LIBADD+= mlx5 CFLAGS+= -DPCAP_SUPPORT_RDMASNIFF .endif From nobody Wed Dec 3 14:45:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM0nd1CD4z6JW1P for ; Wed, 03 Dec 2025 14:46:13 +0000 (UTC) (envelope-from sumit.saxena@broadcom.com) Received: from mail-ot1-x361.google.com (mail-ot1-x361.google.com [IPv6:2607:f8b0:4864:20::361]) (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 4dM0nc3pCXz3R01 for ; Wed, 03 Dec 2025 14:46:12 +0000 (UTC) (envelope-from sumit.saxena@broadcom.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ot1-x361.google.com with SMTP id 46e09a7af769-7c75fc222c3so2743618a34.0 for ; Wed, 03 Dec 2025 06:46:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764773169; x=1765377969; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8U3uKMeyL6SIwSOda04AMvaal0A78qQLjAluXU5lthU=; b=N1lGQM9xAw/mD7QroSEyg5dKdpBUKGo6zOfStvYoGGq1V5xQh0xSGM7OXXG9m+Funs QedvRRRkqrdbFuCAbqQFZ7ikrGZ9/KNdHMfo57wOr2W9xOojDPRNUITMtUPrV7LErvi3 5dbcQG2sZUyDlrkHV2QzghZxIUj7MOYCpKcYNeiuND2XwYR4gjz+mQe39n8S3W1Heyq9 BsMHTNb9efmlvaqYR4ktuhRhKAhOrkqxBszXBBZjTMedIer53nGoRO0DxeNp1BqL5T3+ T2yznJCeYFwDW4aHWtjmUzRGBRS4plv9nXfujy8Qe/xjR9PPHDKf5ih0hnFwIaIyOGvg cc8Q== X-Forwarded-Encrypted: i=1; AJvYcCWvg5Dpwru7nHtcPmdDfQoJMFoAVsJ2vP7anJjrvNU1CVy2Lr7fsa5ytwYCOMSlQp06YQ2JtRr+4bz98WHCU8etgI0iog==@freebsd.org X-Gm-Message-State: AOJu0Yz/iLG/9NAFhbOHKhVHA3TmNF+eq7an8PmI00myti5RCCcXYGlF L/r7DeF7MnqzR5MKbIIH7Ow4WDlHAufWpguHPt/2vLCQiCoWtUZLy3J/kX/f+Xea6pdH9Ec3eSN ffHlCilJ8vJCM4IfPVyjLW7IuPm/fH4WBPSNr5FVrA+oLnpDL7hPshUe2iPGMQrasJKKPFpDHRb Ct1S6dEJfA6JVcMr4kUtS+zqTKd96qKUNglP+Fitmv0DEpTZr6A+dKW5Cr2X2dwJkzBzQ0+t3RU Py72RZnwOhj95Crhcpc5PnS X-Gm-Gg: ASbGncsnu8Unp9XuOXFBm4J71lZpbSBRvqiPGFU3OLR3eQ3jOatDcsAl1roO2v73H0K DEotFRiFi2dXwEE3uFspFkr5Vc8EgeuH5P4km0WDgcUlv7hJ9lAHWlGJDSFRl6iDSYVbCgC0wnq 7bB0zBlE2LumorOPPRDW4OhVerQGOupty9Qzybw5y3FNfNWzlmMxi7aSxRl4ZjjeYfOx+B0n133 jpuYEq4lAYmeyXa4L4sBuZ0CCLb4743sMGIl21bCmA5qQG2IsK+y8VERIaMrurUdmCYCTdKnktn F77gfhWUETxxOxViJ82pdkC5uJ8LmBdjT2quFGUQ3it/BIWKZm1k1EvIAotvpwf7uzhntZ267Cj HWEvSgPVyxtyGyL5zY+xMAFkyuGV2OVH6/wfE26u3VCEvaEJCLZhq4xCKKBXbFMd/1HnH96RMzs OJJfwMS9QebRt1uYW73Ud+CE9DIaMS5o25XQNuPFOeKBQRKQo= X-Google-Smtp-Source: AGHT+IFnSBAzYlN35h0ASBDJatc9NfzR02fxtp0RwGSNNPIP13jplXETzMnfBxvzr/72sJ5+udTUVl7L8C3b X-Received: by 2002:a05:6830:6dc4:b0:7c6:8c73:aafb with SMTP id 46e09a7af769-7c94dc982d7mr1103349a34.35.1764773169471; Wed, 03 Dec 2025 06:46:09 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-103.dlp.protect.broadcom.com. [144.49.247.103]) by smtp-relay.gmail.com with ESMTPS id 46e09a7af769-7c90fb9015bsm2355865a34.4.2025.12.03.06.46.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Dec 2025 06:46:09 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-37d29739b60so32578031fa.1 for ; Wed, 03 Dec 2025 06:46:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1764773167; x=1765377967; 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=8U3uKMeyL6SIwSOda04AMvaal0A78qQLjAluXU5lthU=; b=T8JF46ZHP2efBkpFxY9br6owg9O7k26y39bjxjSUbKNm9pXjo8MYFfezBYKyWj/gRZ mqN+onTutn+hqZeuGsxdEVOuRy5x0UICMDwXtsTl4jvT8WQrUXslAu7lg6cx8uSSZzOW bWxppdKjDVsqIDcdYnFtOM5xU4QRbkXPqkMV4= X-Forwarded-Encrypted: i=1; AJvYcCW2fCvD7Jtww2h00GqUo6HR0BTuCzL27NBQG5umr/Ip9ecsNxNO50v1Q6Myqfn08x4OWwNM6wpjNGhwmvr6VtbGDGmhkA==@freebsd.org X-Received: by 2002:a05:6512:3f14:b0:594:253c:209a with SMTP id 2adb3069b0e04-597d3f5e0d6mr1042408e87.14.1764773166860; Wed, 03 Dec 2025 06:46:06 -0800 (PST) X-Received: by 2002:a05:6512:3f14:b0:594:253c:209a with SMTP id 2adb3069b0e04-597d3f5e0d6mr1042395e87.14.1764773166427; Wed, 03 Dec 2025 06:46:06 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <69302037.3d155.40084cd7@gitrepo.freebsd.org> <20251203140554.150B71E8@slippy.cwsent.com> <20251203144226.89CC91E9@slippy.cwsent.com> In-Reply-To: <20251203144226.89CC91E9@slippy.cwsent.com> From: Sumit Saxena Date: Wed, 3 Dec 2025 20:15:46 +0530 X-Gm-Features: AWmQ_bneJfLkhZnRfSDqvustUn5TyVXZPOlkNtf03lCeyZWt-WfQ6y4kaGPDdgQ Message-ID: Subject: Re: git: 35dd53a9e132 - main - librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping To: Cy Schubert Cc: Sumit Saxena , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="000000000000be21bb06450d450f" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dM0nc3pCXz3R01 --000000000000be21bb06450d450f Content-Type: multipart/alternative; boundary="000000000000b1c69706450d4567" --000000000000b1c69706450d4567 Content-Type: text/plain; charset="UTF-8" > One would apply the author's name and email address using the --author > keyword. true, my bad. I missed it. --000000000000b1c69706450d4567 Content-Type: text/html; charset="UTF-8"


> One would apply the author's name and email address using the --author
> keyword.
true, my bad. I missed it.
--000000000000b1c69706450d4567-- --000000000000be21bb06450d450f Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIIVWQYJKoZIhvcNAQcCoIIVSjCCFUYCAQExDzANBglghkgBZQMEAgEFADALBgkqhkiG9w0BBwGg ghLGMIIGqDCCBJCgAwIBAgIQfofDCS7XZu8vIeKo0KeY9DANBgkqhkiG9w0BAQwFADBMMSAwHgYD VQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UE AxMKR2xvYmFsU2lnbjAeFw0yMzA0MTkwMzUzNTNaFw0yOTA0MTkwMDAwMDBaMFIxCzAJBgNVBAYT AkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIEdDQyBS NiBTTUlNRSBDQSAyMDIzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwjAEbSkPcSyn 26Zn9VtoE/xBvzYmNW29bW1pJZ7jrzKwPJm/GakCvy0IIgObMsx9bpFaq30X1kEJZnLUzuE1/hlc hatYqyORVBeHlv5V0QRSXY4faR0dCkIhXhoGknZ2O0bUJithcN1IsEADNizZ1AJIaWsWbQ4tYEYj ytEdvfkxz1WtX3SjtecZR+9wLJLt6HNa4sC//QKdjyfr/NhDCzYrdIzAssoXFnp4t+HcMyQTrj0r pD8KkPj96sy9axzegLbzte7wgTHbWBeJGp0sKg7BAu+G0Rk6teO1yPd75arbCvfY/NaRRQHk6tmG 71gpLdB1ZhP9IcNYyeTKXIgfMh2tVK9DnXGaksYCyi6WisJa1Oa+poUroX2ESXO6o03lVxiA1xyf G8lUzpUNZonGVrUjhG5+MdY16/6b0uKejZCLbgu6HLPvIyqdTb9XqF4XWWKu+OMDs/rWyQ64v3mv Sa0te5Q5tchm4m9K0Pe9LlIKBk/gsgfaOHJDp4hYx4wocDr8DeCZe5d5wCFkxoGc1ckM8ZoMgpUc 4pgkQE5ShxYMmKbPvNRPa5YFzbFtcFn5RMr1Mju8gt8J0c+dxYco2hi7dEW391KKxGhv7MJBcc+0 x3FFTnmhU+5t6+CnkKMlrmzyaoeVryRTvOiH4FnTNHtVKUYDsCM0CLDdMNgoxgkCAwEAAaOCAX4w ggF6MA4GA1UdDwEB/wQEAwIBhjBMBgNVHSUERTBDBggrBgEFBQcDAgYIKwYBBQUHAwQGCisGAQQB gjcUAgIGCisGAQQBgjcKAwwGCisGAQQBgjcKAwQGCSsGAQQBgjcVBjASBgNVHRMBAf8ECDAGAQH/ AgEAMB0GA1UdDgQWBBQAKTaeXHq6D68tUC3boCOFGLCgkjAfBgNVHSMEGDAWgBSubAWjkxPioufi 1xzWx/B/yGdToDB7BggrBgEFBQcBAQRvMG0wLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwMi5nbG9i YWxzaWduLmNvbS9yb290cjYwOwYIKwYBBQUHMAKGL2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5j b20vY2FjZXJ0L3Jvb3QtcjYuY3J0MDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwuZ2xvYmFs c2lnbi5jb20vcm9vdC1yNi5jcmwwEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEBDAUAA4IC AQCRkUdr1aIDRmkNI5jx5ggapGUThq0KcM2dzpMu314mJne8yKVXwzfKBtqbBjbUNMODnBkhvZcn bHUStur2/nt1tP3ee8KyNhYxzv4DkI0NbV93JChXipfsan7YjdfEk5vI2Fq+wpbGALyyWBgfy79Y IgbYWATB158tvEh5UO8kpGpjY95xv+070X3FYuGyeZyIvao26mN872FuxRxYhNLwGHIy38N9ASa1 Q3BTNKSrHrZngadofHglG5W3TMFR11JOEOAUHhUgpbVVvgCYgGA6dSX0y5z7k3rXVyjFOs7KBSXr dJPKadpl4vqYphH7+P40nzBRcxJHrv5FeXlTrb+drjyXNjZSCmzfkOuCqPspBuJ7vab0/9oeNERg nz6SLCjLKcDXbMbKcRXgNhFBlzN4OUBqieSBXk80w2Nzx12KvNj758WavxOsXIbX0Zxwo1h3uw75 AI2v8qwFWXNclO8qW2VXoq6kihWpeiuvDmFfSAwRLxwwIjgUuzG9SaQ+pOomuaC7QTKWMI0hL0b4 mEPq9GsPPQq1UmwkcYFJ/Z4I93DZuKcXmKMmuANTS6wxwIEw8Q5MQ6y9fbJxGEOgOgYL4QIqNULb 5CYPnt2LeiIiEnh8Uuh8tawqSjnR0h7Bv5q4mgo3L1Z9QQuexUntWD96t4o0q1jXWLyrpgP7Zcnu CzCCBYMwggNroAMCAQICDkXmuwODM8OFZUjm/0VRMA0GCSqGSIb3DQEBDAUAMEwxIDAeBgNVBAsT F0dsb2JhbFNpZ24gUm9vdCBDQSAtIFI2MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpH bG9iYWxTaWduMB4XDTE0MTIxMDAwMDAwMFoXDTM0MTIxMDAwMDAwMFowTDEgMB4GA1UECxMXR2xv YmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh bFNpZ24wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCVB+hzymb57BTKezz3DQjxtEUL LIK0SMbrWzyug7hBkjMUpG9/6SrMxrCIa8W2idHGsv8UzlEUIexK3RtaxtaH7k06FQbtZGYLkoDK RN5zlE7zp4l/T3hjCMgSUG1CZi9NuXkoTVIaihqAtxmBDn7EirxkTCEcQ2jXPTyKxbJm1ZCatzEG xb7ibTIGph75ueuqo7i/voJjUNDwGInf5A959eqiHyrScC5757yTu21T4kh8jBAHOP9msndhfuDq jDyqtKT285VKEgdt/Yyyic/QoGF3yFh0sNQjOvddOsqi250J3l1ELZDxgc1Xkvp+vFAEYzTfa5MY vms2sjnkrCQ2t/DvthwTV5O23rL44oW3c6K4NapF8uCdNqFvVIrxclZuLojFUUJEFZTuo8U4lptO TloLR/MGNkl3MLxxN+Wm7CEIdfzmYRY/d9XZkZeECmzUAk10wBTt/Tn7g/JeFKEEsAvp/u6P4W4L sgizYWYJarEGOmWWWcDwNf3J2iiNGhGHcIEKqJp1HZ46hgUAntuA1iX53AWeJ1lMdjlb6vmlodiD D9H/3zAR+YXPM0j1ym1kFCx6WE/TSwhJxZVkGmMOeT31s4zKWK2cQkV5bg6HGVxUsWW2v4yb3BPp DW+4LtxnbsmLEbWEFIoAGXCDeZGXkdQaJ783HjIH2BRjPChMrwIDAQABo2MwYTAOBgNVHQ8BAf8E BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUrmwFo5MT4qLn4tcc1sfwf8hnU6AwHwYD VR0jBBgwFoAUrmwFo5MT4qLn4tcc1sfwf8hnU6AwDQYJKoZIhvcNAQEMBQADggIBAIMl7ejR/ZVS zZ7ABKCRaeZc0ITe3K2iT+hHeNZlmKlbqDyHfAKK0W63FnPmX8BUmNV0vsHN4hGRrSMYPd3hckSW tJVewHuOmXgWQxNWV7Oiszu1d9xAcqyj65s1PrEIIaHnxEM3eTK+teecLEy8QymZjjDTrCHg4x36 2AczdlQAIiq5TSAucGja5VP8g1zTnfL/RAxEZvLS471GABptArolXY2hMVHdVEYcTduZlu8aHARc phXveOB5/l3bPqpMVf2aFalv4ab733Aw6cPuQkbtwpMFifp9Y3s/0HGBfADomK4OeDTDJfuvCp8g a907E48SjOJBGkh6c6B3ace2XH+CyB7+WBsoK6hsrV5twAXSe7frgP4lN/4Cm2isQl3D7vXM3PBQ ddI2aZzmewTfbgZptt4KCUhZh+t7FGB6ZKppQ++Rx0zsGN1s71MtjJnhXvJyPs9UyL1n7KQPTEX/ 07kwIwdMjxC/hpbZmVq0mVccpMy7FYlTuiwFD+TEnhmxGDTVTJ267fcfrySVBHioA7vugeXaX3yL SqGQdCWnsz5LyCxWvcfI7zjiXJLwefechLp0LWEBIH5+0fJPB1lfiy1DUutGDJTh9WZHeXfVVFsf rSQ3y0VaTqBESMjYsJnFFYQJ9tZJScBluOYacW6gqPGC6EU+bNYC1wpngwVayaQQMIIGjzCCBHeg AwIBAgIMdI2Nfq/Vk8dzZMUnMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQK ExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIEdDQyBSNiBTTUlNRSBDQSAy MDIzMB4XDTI1MDYyMDEwNTUwNVoXDTI3MDYyMTEwNTUwNVowgdcxCzAJBgNVBAYTAlVTMRMwEQYD VQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEZMBcGA1UEYRMQTlRSVVMrREUtNjYx MDExNzEPMA0GA1UEBBMGU2F4ZW5hMQ4wDAYDVQQqEwVTdW1pdDEWMBQGA1UEChMNQlJPQURDT00g SU5DLjEiMCAGA1UEAwwZc3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTEoMCYGCSqGSIb3DQEJARYZ c3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB ANWfdRsD0NsQr9oaNovE6N6ldgUGyJipSPE9u2SuA5SLtk4//f6PIFdR6h5fMMUsw7H4eBqY88Do ifscJ8gSasrjdgcsGC9lCyPXLwfNEU5C3Mbnua8OK6sTBpf6mvY88HW/6AoKiSpfo5jxCZQOm4Zz oJWD5ea7ThJ2XdDk1rRtGUkwFgN9GRNfOoiIwkkA7EdEfV0eQkVqNgkqUyBSABXcduul2sd4/JQO SsVmTdSKid7L6yZsqk5b3Xj+GMJwPdRfeKP2SRoys0SVnajc9Di+9Jy7uGKxxtb562egZauDFX/0 o0UgYfZrbwWfzJDYMLKzlrOD0M8yGkD8BnyIiVECAwEAAaOCAd0wggHZMA4GA1UdDwEB/wQEAwIF oDAMBgNVHRMBAf8EAjAAMIGTBggrBgEFBQcBAQSBhjCBgzBGBggrBgEFBQcwAoY6aHR0cDovL3Nl Y3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3NnY2NyNnNtaW1lY2EyMDIzLmNydDA5BggrBgEF BQcwAYYtaHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3NnY2NyNnNtaW1lY2EyMDIzMGUGA1Ud IAReMFwwCQYHZ4EMAQUDAzALBgkrBgEEAaAyASgwQgYKKwYBBAGgMgoDAjA0MDIGCCsGAQUFBwIB FiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzBBBgNVHR8EOjA4MDagNKAy hjBodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzZ2NjcjZzbWltZWNhMjAyMy5jcmwwJAYDVR0R BB0wG4EZc3VtaXQuc2F4ZW5hQGJyb2FkY29tLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDBDAfBgNV HSMEGDAWgBQAKTaeXHq6D68tUC3boCOFGLCgkjAdBgNVHQ4EFgQURSmmYGaiq6dg3CEvXQGHEXJF 8xwwDQYJKoZIhvcNAQELBQADggIBAAl0pcCjujKdwmgtiGl2naEY5wB4G601Kuu3032tR7wmgZLg k+lg9fhAA0boPsi1FE1Pwb93YDBGr/naS/oQ9JglSMeEVzeRvCqjFS4FpouBAFHB77c8w3ZwJ3+t FSRJW9SbW0DADBn5t8GAjv2aSm5vDorqFe9MKOYEe50yYDQEUAsEt5QkrLTcEx9ntvVb25MxI8vM bdfqna+/TyCmFmnGAz58jiw5DxLn++6wMmAk0SeUEuMrAlRIyhte6BBSBQ5cL1P+DWSqQbm/pwCq NhySSLNtTi2dKJvvg6Ax9au913KiJj6uZfPlh6/0kaVKM5GhIABUcm3c6g2qD7ITJxB/p1kjYKLa hVrtrjK7000lHKTPFr6MWB4Ggx7yKQ9yIlPMKKF/Lj8FabYCqeM5ovG7kaK8FYXug5vjNjN0nedR X3P8o+8aL6WFIAAAKm2DqZh3252Gcken8v5c+f0SXWSJFvemfFNgrJiQFnFVrOE5v7qwvM/KvVCA dYm4Ph9QYI0sm+Xitx8MkdOJtq5mcPWowGi8UiCgkOidv4ki1SA0wptfquUhbfS9b2M3XUHCEIUX 4ECvIjR3f+E0NbBIfPccWfYUaDLvo2qhLYS3KQbhKdXcJ83ha17mbVNZbDDo9upNcLO/oPyDbCNF J6UpXZmis1wnCynhK4kQfwFhW7H+MYICVzCCAlMCAQEwYjBSMQswCQYDVQQGEwJCRTEZMBcGA1UE ChMQR2xvYmFsU2lnbiBudi1zYTEoMCYGA1UEAxMfR2xvYmFsU2lnbiBHQ0MgUjYgU01JTUUgQ0Eg MjAyMwIMdI2Nfq/Vk8dzZMUnMA0GCWCGSAFlAwQCAQUAoIHHMC8GCSqGSIb3DQEJBDEiBCB9uQbZ S9WTxxkBXFdReYhjZOVT1uTiChXVQhuMDL8eMDAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwG CSqGSIb3DQEJBTEPFw0yNTEyMDMxNDQ2MDdaMFwGCSqGSIb3DQEJDzFPME0wCwYJYIZIAWUDBAEq MAsGCWCGSAFlAwQBFjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwCwYJKoZIhvcNAQEHMAsGCWCG SAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQCffcCfzPFbI2lr2y1YaFAwtUna9ZuHIdFJK0MEQ7xc uy4Y7Kf4YQjOJJ569tyxYAXjZDP+csMAp9iEQBvkwrVbhhghgHsYKSKcBKJlAnzJmnTE0GFlKp4B XQ5xSwjDIp+dMIWCJ+qcMz6R6Z9kCsgPvS4f62eyfdcdfDzy59YCuXjBgqhhSpCAWiNkSernPwMw ytAxygSKRKGD5DItHD+S69exQRngjyjvGI1DVRbS46Tl5pzaUPheTmqlx8Wnej9cb8uV3CdhlN+2 4nitWnvQZ+EU9fgh+65n3MH7bQepZk4VIDIyiW7iUjBXX02WcoxjnTU4E0bEz2G7kpYprYhc --000000000000be21bb06450d450f-- From nobody Wed Dec 3 14:58:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM14B4vs0z6JXFX for ; Wed, 03 Dec 2025 14:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM14B44f9z3SGf for ; Wed, 03 Dec 2025 14:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kd2Fa3owU3yG4HmSmBbJCLVxp8N+i0uqy4Mt9H1N/8U=; b=RbHritnHBYNaqw1kRRNHhVJlcB5HJBXrb66F50oAzxo0ELHFp4N23oL1ItgrgAG+8gATNH Q/u0h0quZ0BHAv9Y4lKPQ2Z/R/bwkQhik541Rcj3ztz7ZrtY5bgHf1St3+lpIDFXlQItUl e9D04BAUsWZxF2bglAJ5kLS4Zzu+VYpqdcWUadBrQuBtx3OJY0KfCsQmlN4mfCZ3kepJ8Q NQZEIP45xLXjYe432HVWqIf/EYFz/13vEnaoWLnhVPZOszUfO5EoS4J5IhX6Uhw7Qv6oUO EeSjJX5axRHvbpEhV6ikWx1qdixSOWrn8n5R/xbmDJcm2/f8VoN+xrI2rTOotQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kd2Fa3owU3yG4HmSmBbJCLVxp8N+i0uqy4Mt9H1N/8U=; b=FLM5ZJl5FZGSt2tDUEsiK/YGDme0Ags7RbjyzJxQthVfLoOOLxNkd3Vh1HYWBEECKSQSzw vFc0NWDqu+iFVnR59aVHeyABtu04soOE+mo3tKWalicE/2OTP28fBHN8ZSs9a3nPd0Qu47 B8+vrnwFCnmTBIfCEqGHeuPErVc40dpstN+NRglTMQaApFzKgMmquk9Jo860w0Qez27eM2 gpca7MwisjGXrXPxNKIPVjpK6iFIiZWBKMLFz7+EKnzTb4RPsigdLu13dsy+m/KuW7cVLv pzMqmSeh/DS6xsUtKQ8GS8lwHF/uTHVmWbgECzcq4EyLjUVSAVazEJwGxZRI+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764773930; a=rsa-sha256; cv=none; b=w95a6n9NXbs25qkiUBUN0bATKOdqb08z2WUMqVYCDMfwOdw1BLN361CIZposeM4XORJKZU 7FHB7BQJEkBz4nP8o5mJ/2eq7e7uVSl8kHofMPWUJH8gpc9RRbrfG2VRcP75ZGwpzonFWH URCOQfp0pXBm5PmwvqQZ0Q6cNloCkCjA1l+XyVmn1JZcSOkEY2ghZoysSvp2V/q+FlTAww 6RAmor8lO23ggefr/45IcbOCf5NwJGtuk1dB2WDhwRzUYd5M+W4yG95AiOkjNVoKclbD9Z 07VMdhPNH/dLaamM7H9XmRoWz+ytUqfkaTrL/cPHeMaHka2/RA/TTZo2fKLYrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM14B3TKxzjH1 for ; Wed, 03 Dec 2025 14:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2b647 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 14:58:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Timothy Pearson Subject: git: 84fd37f30958 - main - committers-src: add myself (tpearson@) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tpearson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84fd37f309585742e142d3e82f8b9067ad2eb2b1 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 14:58:50 +0000 Message-Id: <6930502a.2b647.41f57d23@gitrepo.freebsd.org> The branch main has been updated by tpearson: URL: https://cgit.FreeBSD.org/src/commit/?id=84fd37f309585742e142d3e82f8b9067ad2eb2b1 commit 84fd37f309585742e142d3e82f8b9067ad2eb2b1 Author: Timothy Pearson AuthorDate: 2025-12-02 23:36:04 +0000 Commit: Timothy Pearson CommitDate: 2025-12-03 14:58:32 +0000 committers-src: add myself (tpearson@) Add myself (tpearson@) as a new src committer with jhibbits@ as my mentor. Approved by: jhibbits(mentor) --- share/misc/committers-src.dot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 3f3e39635c55..8eedf6bb8abb 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -377,6 +377,7 @@ thompsa [label="Andrew Thompson\nthompsa@FreeBSD.org\n2005/05/25"] ticso [label="Bernd Walter\nticso@FreeBSD.org\n2002/01/31"] tijl [label="Tijl Coosemans\ntijl@FreeBSD.org\n2010/07/16"] tmunro [label="Thomas Munro\ntmunro@FreeBSD.org\n2018/10/15"] +tpearson [label="Timothy Pearson\ntpearson@FreeBSD.org\n2025/12/02"] tsoome [label="Toomas Soome\ntsoome@FreeBSD.org\n2016/08/10"] trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2008/08/22"] trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/05/28"] @@ -678,6 +679,7 @@ jhibbits -> alfredo jhibbits -> bdragon jhibbits -> leitao jhibbits -> luporl +jhibbits -> tpearson jimharris -> carl From nobody Wed Dec 3 14:58:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM14C6T4Zz6JX1v for ; Wed, 03 Dec 2025 14:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM14C4rYJz3SF0 for ; Wed, 03 Dec 2025 14:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8vqbvOmxOZnjNTJT3ZNpDZqoetAilc96gdvIvZ5EWg=; b=RIUmd4YoufLfANm6Ag7F+BUsPmytZlchLgtW8Dy1QXkNkLK61/PaKFDN5Gi9SY9WwL/otq U7WppdAtHDo3CIl4bnD8kP67XB0mcSFxAdiq27fbQkm78jTvwB9HSnKVesDwAX4B5n1xR7 s2/QY3OCUMjFWXoiP8YUNh/wlviHg9rD0w246qdz2NHAdDFiu8gvSh34sFqtokAD5MEtqA /ivl2NqHXTpiwhgW/9UvuUjGdOG+FmMgAUxmj4/FgXyj9OIAL3WqAm//suwexVvIwpRScf qkuqUf145dv1sLpARRxS3nvHnhib+ZLuu8JRjZ0EeWNrHO/eUduJdiog85Sypg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764773931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8vqbvOmxOZnjNTJT3ZNpDZqoetAilc96gdvIvZ5EWg=; b=VvNppLpFWvLHF5rkn8U3W02LpOBB5mjV4CeT7uKYB8oWfOzNEUmADWTQYw7EZrQTe+/ysL U6G+b3i2BTrAYeGeTAvsSS1RN1mVBMc7IDuAlSrSKU7rgMOtPpo/njTKao3YlJzm45YHTU KQWi0oFMSO2IU/zG3C+0ogZHNS4DO9gZkChF4ylaxIbfVSmT58qj7jYH26Gth/dxKaA2Hx WuNHzWgy/kypI2d2K70I55wHDMd4xAICLvHHZgb9bf/2G9Eju6PERGdiyF5YiiQSehPrcZ b1Z+X/LJh5fFG1X6yF1Q1Hbxxn51D+3LyvEsYCNNnRcGIMT3Oj8kybMzwWsBbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764773931; a=rsa-sha256; cv=none; b=uMH+WTV9ZBKaU/btcODQcrp2aDJusswqd7koMSCYdwjTINWMefmnmFuP8arkfubY0uryJO n4J/Pyv5LXZxp8HNq3+TkBWpMu/yXpAcHxByL896PzH26bPDCInEWa5sL/+VHawRXBXHng ZLJ20T4PzOORFP/vKbUzHfYr8bIv8dBRynC4YPmF5s4DVenqnCYRbVQP24CeryWchIoq/W 2WE+ICV00FVca/3++sU5+6oRlWP1c7Dxl+33/QPQiWCUs8CQfOmGhILPeBHLD2RapSIjh7 X3sNNSAqkAs+wGsxWS62NlrMNSVd7klsXJyklI/ESyjdBkhhIoAkFq3uC1mD6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM14C47cPzjf3 for ; Wed, 03 Dec 2025 14:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2adb0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 14:58:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Timothy Pearson Subject: git: 812bcb7cabbb - main - mailmap: add my Raptor Engineering address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tpearson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 812bcb7cabbb245b2d4496ad55bdfa70f9c587db Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 14:58:51 +0000 Message-Id: <6930502b.2adb0.7fc4a35d@gitrepo.freebsd.org> The branch main has been updated by tpearson: URL: https://cgit.FreeBSD.org/src/commit/?id=812bcb7cabbb245b2d4496ad55bdfa70f9c587db commit 812bcb7cabbb245b2d4496ad55bdfa70f9c587db Author: Timothy Pearson AuthorDate: 2025-12-02 23:32:53 +0000 Commit: Timothy Pearson CommitDate: 2025-12-03 14:58:33 +0000 mailmap: add my Raptor Engineering address Approved by: jhibbits(mentor) --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 10141fcf7b6c..c0fc3b05311b 100644 --- a/.mailmap +++ b/.mailmap @@ -22,3 +22,4 @@ Ganael LAPLANCHE Joyu Liao Joyu Liao + From nobody Wed Dec 3 15:07:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM1Gj2yHZz6JXtQ for ; Wed, 03 Dec 2025 15:07: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM1Gj2Fz8z3TjF for ; Wed, 03 Dec 2025 15:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764774477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=67IFTPNUE5ewqZ3w3VN0jKEot1ZLU4zUzIS4fxdi+UQ=; b=iFgSjqdbHoFN3LbnQf6f8l6DHCrNqpkRACiaJP5pjWEiXGZQNxELB6FVUsIknUtoHpyI32 yMcm9bSpxvHHX5HTuMl97sCWu8pSfvyE5tQAWEmk/g/hnUQP/UnktglnZLx/ELoRtJLCjH ZdcnNW+UOfJ7NajSBiGVCy6uBfWR47ZEY2G4p58qi8y0mjgSfj2f1uad42lT9Mjo3a1tk2 pfnjvEvMBGYtNXRGL/lnVFuEGjBgnxWNtIMmDp48GuchUPFJGLb3L2DQmW568Qnh8/qjtM p+mj8h7VbIgCdTLJTusTzVEmT2qSge+K90d76Law2PncOSC3kKoMoH1k4fdQIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764774477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=67IFTPNUE5ewqZ3w3VN0jKEot1ZLU4zUzIS4fxdi+UQ=; b=nieUJs0ENCKlPvFoDUyOq8Bei/FvL7K7/9mOBawM0RJGfuKLvfo1mxNBXEGnhcTdVw7RFe Tt8Us7c5W7tH0IvSCwGWdAsVKO+O8Tujucw/vGrFfR+/9Imu4Y46dMDcaj5lAfv/Fo54nU FI6yf7Y1AUW5fQiOtMI6YbGsqDkdnfn0ReCGDRHtcCW4ZVUZzwubre0nNjY4RSBPWHgmFI Wds2OQwu/1UZkYa1fZ5inQ98l83VTAAQVXTH9M/wmFXhEHlgzOOgm0wS6U/Fd81cfyyn19 3vKvNIjdL7s5b2qbQWAI5GbJrsTV8L6rWPH9gqEbM0L12sszAM/qly5xjo/4Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764774477; a=rsa-sha256; cv=none; b=AER+ha2VdzDAgCrniAyeFcByRmxf1FuMKRzHgCrtr7bvZgZbsQ+M1gB3q4NdQF/id7qo6r ubT98sUOwL8RU7QiqbFel4rlvHGnDd6n+pcVddXrmMOmkLhjkUMGCOwH1/OdgNwgbPz8P2 +3e8EMyELfir0u63zCCEJjZfEMfq5uViBjqdKb+C97YODtKoo5ytDJD/9+LQWJeoETBL8j aH1NZth5I+dN4vpN3j499Vlc2galwMnjCR1gnRSOjxaRo7dHDactcZ25C+gEjtpfQMdF4B ARipsxvRCtbufdCSb3jkdLsfco4Cw2OomCkXp+WwFH5sA2fNXe7bOEAAIDeqpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM1Gj1h2Yzk7y for ; Wed, 03 Dec 2025 15:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d527 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 15:07:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e19230d49ffc - main - Makefile.inc1: Fix the libbnxtre dependency target List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e19230d49ffc02944d93645800da934b7aeee078 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 15:07:52 +0000 Message-Id: <69305248.2d527.389a12d6@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e19230d49ffc02944d93645800da934b7aeee078 commit e19230d49ffc02944d93645800da934b7aeee078 Author: Mark Johnston AuthorDate: 2025-12-03 15:06:54 +0000 Commit: Mark Johnston CommitDate: 2025-12-03 15:07:43 +0000 Makefile.inc1: Fix the libbnxtre dependency target Reported by: Jenkins Fixes: 73e8fe62466a ("libpcap: Fix dependency definitions for libpcap") --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0f1e66a89da8..cc1901a1e950 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3363,7 +3363,7 @@ _prebuild_libs+= \ lib/ofed/libibmad__L: lib/ofed/libibumad__L lib/ofed/complib__L: lib/libthr__L -lib/ofed/libbnxt__L: lib/ofed/libibverbs__L lib/libthr__L +lib/ofed/libbnxtre__L: lib/ofed/libibverbs__L lib/libthr__L lib/ofed/libmlx5__L: lib/ofed/libibverbs__L lib/libthr__L .endif From nobody Wed Dec 3 18:18:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM5V76Wyqz6JnqD for ; Wed, 03 Dec 2025 18:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM5V76Dqtz3tZV for ; Wed, 03 Dec 2025 18:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764785887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TT1EDjrl5ftm6HD8p0Z3PULjWGDI1JUOMkZD7g/kFT0=; b=D6Z8Og1XY+NANbiMd1gmpRdg3rLeaKzvXemAJGs5ix3QFioc9C4R/rAW2RjOrd/EFKlCU5 z+3oZIexnlJL74uV3HigGJS86b3Hp35Q6Sl85bHaAxTSpO4vC8YN5qE0Z6UpvPofRDXXZL DIXfKni7SSMCDKLUlk2wjvhM/nFcofXnC9bS5WKr0APepukKrWh4GATuQqTcKe8FjOnAZn Z0pJm10FuefLWl31Di8VrhvEpbOpLkO09QdzJvmTjGEB6CS9rdK9KNYs9vnflKzZKd8BVc f4LV2y3LRCgXPLnYtL+lcsmTDCMVvEII5vfVUphE5IVQlZv+MZiYUNn4q3BJBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764785887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TT1EDjrl5ftm6HD8p0Z3PULjWGDI1JUOMkZD7g/kFT0=; b=FGyHu8DjLFXq91ooiR/O8fM7769mituL/boaqJZL+e2KhX0b7AvJh3fD6DcsFbG/OUgsi5 7f8lqb2IFFk2t/2sxhcJ0IzLRhEhPHq2gB4Cn3NrPjwfjioMgu5I8PD2EfiJAIteIiIDNP foaptkgQwrEGUjVdAVJaURCUl1ClOCMvBOXdc6h8EVHzGDo8Oy68gce4yDWivYLdmJD9+V Ln/p0rEF2gGp++vjg7tv3J9NX2ID1BBebM8+B86VS/eB5hWHZdiqbc1+ymZOtFsBrd31Cn fzS+Jk848qiDB3bM4c6mmOx0Tfdf88Uu0t7wAGg9WqYqu/WH87hhw3JE1aLbtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764785887; a=rsa-sha256; cv=none; b=Zx4zbRz0JdbmRuzWr4+4uA7wnZAGxXssm9Tv0A7jYnGPBtUqnnGF1TYqAyI4AL+RTvnNUZ 1WCnA3rIAbci8uWnarlh1QnCP+rEibv8IwHvZPDtx+vBjpaxl5ghJ7YG9UOy4edYLPVlyL YPvj23bf3MW3fvUBgYDNedh/aobkhdqE4oBrPD04lOz6XvQUephgVaXgGXm9xgbX7VLHQg lVBh96zNzJVqjOXDnf5+yk+bWxO0LSI5wcTwwEXCc6nVjjXAZztxmTp9ABrjXUcE/QUrHr K7OmZXpVC1o0lBGlQNvP6jZLo0h9VyP1a3gGPcC0VHtOkL9a0d1fB8uNle93dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM5V75WHcznc3 for ; Wed, 03 Dec 2025 18:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fc1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 18:18:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: c60f6422ffae - main - Update to bmake-20251111 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c60f6422ffae3ea85e7b10bad950ad27c463af18 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 18:18:01 +0000 Message-Id: <69307ed9.fc1c.43204c2e@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c60f6422ffae3ea85e7b10bad950ad27c463af18 commit c60f6422ffae3ea85e7b10bad950ad27c463af18 Merge: e19230d49ffc 638c66de4a0f Author: Simon J. Gerraty AuthorDate: 2025-12-03 18:13:30 +0000 Commit: Simon J. Gerraty CommitDate: 2025-12-03 18:15:46 +0000 Update to bmake-20251111 Merge commit '638c66de4a0faa4c2e815e81cd4021c2387c7e0f' contrib/bmake/ChangeLog | 37 ++++++ contrib/bmake/FILES | 2 + contrib/bmake/LICENSE | 6 +- contrib/bmake/VERSION | 2 +- contrib/bmake/bmake.1 | 13 +- contrib/bmake/bmake.cat1 | 12 +- contrib/bmake/boot-strap | 23 +++- contrib/bmake/configure | 53 ++++++-- contrib/bmake/configure.in | 36 ++++- contrib/bmake/install-sh | 11 +- contrib/bmake/main.c | 13 +- contrib/bmake/make.1 | 13 +- contrib/bmake/mk/ChangeLog | 49 +++++++ contrib/bmake/mk/auto.dep.mk | 12 +- contrib/bmake/mk/auto.obj.mk | 11 +- contrib/bmake/mk/autoconf.mk | 11 +- contrib/bmake/mk/autodep.mk | 12 +- contrib/bmake/mk/cc-wrap.mk | 11 +- contrib/bmake/mk/ccm.dep.mk | 12 +- contrib/bmake/mk/compiler.mk | 11 +- contrib/bmake/mk/cython.mk | 12 +- contrib/bmake/mk/dirdeps-cache-update.mk | 11 +- contrib/bmake/mk/dirdeps-options.mk | 11 +- contrib/bmake/mk/dirdeps-targets.mk | 18 +-- contrib/bmake/mk/dpadd.mk | 11 +- contrib/bmake/mk/files.mk | 11 +- contrib/bmake/mk/gendirdeps.mk | 5 +- contrib/bmake/mk/genfiles.mk | 11 +- contrib/bmake/mk/host-target.mk | 12 +- contrib/bmake/mk/host.libnames.mk | 9 +- contrib/bmake/mk/inc.mk | 11 +- contrib/bmake/mk/init.mk | 11 +- contrib/bmake/mk/install-mk | 11 +- contrib/bmake/mk/install-new.mk | 36 ++--- contrib/bmake/mk/install-sh | 11 +- contrib/bmake/mk/java.mk | 12 +- contrib/bmake/mk/jobs.mk | 11 +- contrib/bmake/mk/ldorder.mk | 11 +- contrib/bmake/mk/libnames.mk | 11 +- contrib/bmake/mk/libs.mk | 11 +- contrib/bmake/mk/links.mk | 11 +- contrib/bmake/mk/manifest.mk | 11 +- contrib/bmake/mk/meta.autodep.mk | 12 +- contrib/bmake/mk/meta.stage.mk | 26 ++-- contrib/bmake/mk/meta.subdir.mk | 12 +- contrib/bmake/mk/meta.sys.mk | 12 +- contrib/bmake/mk/meta2deps.sh | 24 +++- contrib/bmake/mk/mkopt.sh | 10 +- contrib/bmake/mk/newlog.sh | 11 +- contrib/bmake/mk/obj.mk | 11 +- contrib/bmake/mk/options.mk | 148 ++++++++++++++------- contrib/bmake/mk/posix.mk | 11 +- contrib/bmake/mk/prlist.mk | 11 +- contrib/bmake/mk/progs.mk | 11 +- contrib/bmake/mk/rst2htm.mk | 11 +- contrib/bmake/mk/rust.mk | 12 +- contrib/bmake/mk/scripts.mk | 11 +- contrib/bmake/mk/setopts.sh | 9 +- contrib/bmake/mk/srctop.mk | 11 +- contrib/bmake/mk/stage-install.sh | 9 +- contrib/bmake/mk/subdir.mk | 11 +- contrib/bmake/mk/suffixes.mk | 11 +- contrib/bmake/mk/sys.clean-env.mk | 11 +- contrib/bmake/mk/sys.debug.mk | 11 +- contrib/bmake/mk/sys.dependfile.mk | 11 +- contrib/bmake/mk/sys.dirdeps.mk | 11 +- contrib/bmake/mk/sys.mk | 11 +- contrib/bmake/mk/sys.vars.mk | 36 +++-- contrib/bmake/mk/target-flags.mk | 13 +- contrib/bmake/mk/warnings.mk | 12 +- contrib/bmake/mk/whats.mk | 11 +- contrib/bmake/mk/yacc.mk | 12 +- contrib/bmake/os.sh | 9 +- contrib/bmake/sigaction.c | 14 +- contrib/bmake/sigcompat.c | 14 +- contrib/bmake/unit-tests/Makefile | 31 ++++- contrib/bmake/unit-tests/Makefile.config.in | 7 +- contrib/bmake/unit-tests/directive-dinclude.mk | 2 +- .../bmake/unit-tests/directive-hyphen-include.mk | 2 +- .../bmake/unit-tests/directive-include-guard.mk | 4 +- contrib/bmake/unit-tests/directive-include.mk | 2 +- contrib/bmake/unit-tests/directive-sinclude.mk | 2 +- contrib/bmake/unit-tests/opt-debug-file.exp | 2 +- contrib/bmake/unit-tests/opt-debug-file.mk | 6 +- contrib/bmake/unit-tests/varmod-sun-shell1.exp | 14 ++ contrib/bmake/unit-tests/varmod-sun-shell1.mk | 25 ++++ contrib/bmake/unit-tests/varname-circumflex.mk | 4 +- contrib/bmake/var.c | 46 ++++++- contrib/bmake/wait.h | 14 +- usr.bin/bmake/Makefile.config | 2 +- usr.bin/bmake/config.h | 4 +- usr.bin/bmake/unit-tests/Makefile | 31 ++++- usr.bin/bmake/unit-tests/Makefile.config | 7 +- 93 files changed, 688 insertions(+), 696 deletions(-) diff --cc contrib/bmake/mk/install-mk index 3ed5fd63ee5c,f61d38947b11..f61d38947b11 mode 100755,100644..100644 --- a/contrib/bmake/mk/install-mk +++ b/contrib/bmake/mk/install-mk diff --cc contrib/bmake/unit-tests/varmod-sun-shell1.exp index 000000000000,28fd1fa3d481..28fd1fa3d481 mode 000000,100644..100644 --- a/contrib/bmake/unit-tests/varmod-sun-shell1.exp +++ b/contrib/bmake/unit-tests/varmod-sun-shell1.exp diff --cc contrib/bmake/unit-tests/varmod-sun-shell1.mk index 000000000000,a15c93450e76..a15c93450e76 mode 000000,100644..100644 --- a/contrib/bmake/unit-tests/varmod-sun-shell1.mk +++ b/contrib/bmake/unit-tests/varmod-sun-shell1.mk diff --cc usr.bin/bmake/Makefile.config index 2415f9d3882c,000000000000..16cce3e1658a mode 100644,000000..100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@@ -1,28 -1,0 +1,28 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# + +SRCTOP?= ${.CURDIR:H:H} + +# things set by configure + - _MAKE_VERSION?=20250804 ++_MAKE_VERSION?=20251111 + +prefix?= /usr +srcdir= ${SRCTOP}/contrib/bmake +CC?= cc +MAKE_OS?= +DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk + +EGREP= egrep +CPPFLAGS+= +CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H +LDFLAGS+= +LIBOBJS+= ${LIBOBJDIR}stresep$U.o +LDADD+= +USE_META?= yes +USE_FILEMON?= dev +FILEMON_H?= /usr/include/dev/filemon/filemon.h +BMAKE_PATH_MAX?= 1024 +# used if MAXPATHLEN not defined +CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} diff --cc usr.bin/bmake/config.h index 33aed8f160c8,000000000000..fecfc2be4adb mode 100644,000000..100644 --- a/usr.bin/bmake/config.h +++ b/usr.bin/bmake/config.h @@@ -1,449 -1,0 +1,449 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Path of default shell */ +/* #undef DEFSHELL_CUSTOM */ + +/* Shell spec to use by default */ +/* #undef DEFSHELL_INDEX */ + +/* Path of default shell */ +/* #undef DEFSHELL_PATH */ + +/* Define to 1 if you have the header file. */ +#define HAVE_AR_H 1 + +/* Define to 1 if you have the declaration of 'sys_siglist', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_SIGLIST 1 + +/* Define to 1 if you have the header file, and it defines 'DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the 'dirname' function. */ +#define HAVE_DIRNAME 1 + +/* Define to 1 if you don't have 'vprintf' but do have '_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the 'err' function. */ +#define HAVE_ERR 1 + +/* Define to 1 if you have the 'errx' function. */ +#define HAVE_ERRX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the 'fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the 'getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the 'getenv' function. */ +#define HAVE_GETENV 1 + +/* Define to 1 if you have the 'getopt' function. */ +#define HAVE_GETOPT 1 + +/* Define to 1 if you have the 'getwd' function. */ +#define HAVE_GETWD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the 'killpg' function. */ +#define HAVE_KILLPG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBGEN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if the system has the type 'long long int'. */ +#define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if you have the header file, and it defines 'DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define to 1 if you have the 'putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_RANLIB_H 1 + +/* Define to 1 if you have the 'realpath' function. */ +#define HAVE_REALPATH 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_REGEX_H 1 + +/* Define to 1 if you have the 'select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the 'setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the 'setpgid' function. */ +#define HAVE_SETPGID 1 + +/* Define to 1 if you have the 'setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the 'setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the 'sigaction' function. */ +#define HAVE_SIGACTION 1 + +/* Define to 1 if you have the 'sigaddset' function. */ +#define HAVE_SIGADDSET 1 + +/* Define to 1 if you have the 'sigpending' function. */ +#define HAVE_SIGPENDING 1 + +/* Define to 1 if you have the 'sigprocmask' function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define to 1 if you have the 'sigsetmask' function. */ +#define HAVE_SIGSETMASK 1 + +/* Define to 1 if you have the 'sigsuspend' function. */ +#define HAVE_SIGSUSPEND 1 + +/* Define to 1 if you have the 'sigvec' function. */ +#define HAVE_SIGVEC 1 + +/* Define to 1 if the system has the type 'sig_atomic_t'. */ +#define HAVE_SIG_ATOMIC_T 1 + +/* Define to 1 if you have the 'snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the 'strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the 'stresep' function. */ +/* #undef HAVE_STRESEP */ + +/* Define to 1 if you have the 'strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the 'strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define to 1 if you have the 'strtod' function. */ +#define HAVE_STRTOD 1 + +/* Define to 1 if you have the 'strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if you have the 'strtoll' function. */ +#define HAVE_STRTOLL 1 + +/* Define to 1 if you have the 'strtoul' function. */ +#define HAVE_STRTOUL 1 + +/* Define to 1 if you have the 'sysctl' function. */ +#define HAVE_SYSCTL 1 + +/* Define to 1 if you have the header file, and it defines 'DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file, and it defines 'DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SYSCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the 'unsetenv' function. */ +#define HAVE_UNSETENV 1 + +/* Define to 1 if the system has the type 'unsigned long long int'. */ +#define HAVE_UNSIGNED_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UTIME_H 1 + +/* Define to 1 if you have the 'vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the 'vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define to 1 if you have the 'vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the 'wait3' function. */ +#define HAVE_WAIT3 1 + +/* Define to 1 if you have the 'wait4' function. */ +#define HAVE_WAIT4 1 + +/* Define to 1 if you have the 'waitpid' function. */ +#define HAVE_WAITPID 1 + +/* Define to 1 if you have the 'warn' function. */ +#define HAVE_WARN 1 + +/* Define to 1 if you have the 'warnx' function. */ +#define HAVE_WARNX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if 'fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if 'vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* define if your compiler has __attribute__ */ +#define HAVE___ATTRIBUTE__ 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "sjg@NetBSD.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "bmake" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "bmake 20240711" ++#define PACKAGE_STRING "bmake 20251111" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "bmake" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "20240711" ++#define PACKAGE_VERSION "20251111" + +/* Define to 1 if the 'S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Define to 1 if your declares 'struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# define __STDC_WANT_IEC_60559_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* C99 function name */ +/* #undef __func__ */ + +/* Define to empty if 'const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to '__inline__' or '__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to 'int' if does not define. */ +/* #undef mode_t */ + +/* Define to 'long int' if does not define. */ +/* #undef off_t */ + +/* Define as a signed integer type capable of holding a process identifier. */ +/* #undef pid_t */ + +/* type that signal handlers can safely frob */ +/* #undef sig_atomic_t */ + +/* Define as 'unsigned int' if doesn't define. */ +/* #undef size_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define as 'fork' if 'vfork' does not work. */ +/* #undef vfork */ diff --cc usr.bin/bmake/unit-tests/Makefile index 66bdc04321e8,000000000000..d04a45b93247 mode 100644,000000..100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@@ -1,924 -1,0 +1,943 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# - # $Id: Makefile,v 1.245 2025/08/05 16:18:07 sjg Exp $ ++# $Id: Makefile,v 1.251 2025/11/15 17:17:18 sjg Exp $ +# - # $NetBSD: Makefile,v 1.372 2025/08/04 22:44:49 sjg Exp $ ++# $NetBSD: Makefile,v 1.373 2025/11/12 22:14:08 sjg Exp $ +# +# Unit tests for make(1) +# +# The main targets are: +# +# all: +# run all the tests +# test: +# run 'all', and compare to expected results +# accept: +# move generated output to expected results +# +# Settable variables +# +# TEST_MAKE +# The make program to be tested. +# +# +# Adding a test case +# +# Each feature should get its own set of tests in its own suitably +# named makefile (*.mk), with its own set of expected results (*.exp), +# and it should be added to the TESTS list. +# + +.MAIN: all + +# we use these below but we might be an older make +.MAKE.OS?= ${uname -s:L:sh} +.MAKE.UID?= ${id -u:L:sh} + +# for many tests we need a TMPDIR that will not collide +# with other users. +.if ${.OBJDIR} != ${.CURDIR} +# easy +TMPDIR:= ${.OBJDIR}/tmp +.elif defined(TMPDIR) +TMPDIR:= ${TMPDIR}/uid${.MAKE.UID} +.else +TMPDIR:= /tmp/uid${.MAKE.UID} +.endif +# make sure it exists +.if !exist(${TMPDIR}) +_!= mkdir -p ${TMPDIR} +.endif +# and clean it up - outside the context of +# any target that might be using it. +.END: rm-tmpdir +rm-tmpdir: .NOMETA + @rm -rf ${TMPDIR} + +# Each test is in a sub-makefile. +# Keep the list sorted. +# Any test that is commented out must be ignored in +# src/tests/usr.bin/make/t_make.sh as well. +#TESTS+= archive +#TESTS+= archive-suffix +TESTS+= char-005c-reverse-solidus +TESTS+= cmd-errors +TESTS+= cmd-errors-jobs +TESTS+= cmd-errors-lint +TESTS+= cmd-interrupt +TESTS+= cmdline +TESTS+= cmdline-redirect-stdin +TESTS+= cmdline-undefined +TESTS+= comment +TESTS+= compat-error +TESTS+= cond-cmp-numeric +TESTS+= cond-cmp-numeric-eq +TESTS+= cond-cmp-numeric-ge +TESTS+= cond-cmp-numeric-gt +TESTS+= cond-cmp-numeric-le +TESTS+= cond-cmp-numeric-lt +TESTS+= cond-cmp-numeric-ne +TESTS+= cond-cmp-string +TESTS+= cond-cmp-unary +TESTS+= cond-eof +TESTS+= cond-func +TESTS+= cond-func-commands +TESTS+= cond-func-defined +TESTS+= cond-func-empty +TESTS+= cond-func-exists +TESTS+= cond-func-make +TESTS+= cond-func-make-main +TESTS+= cond-func-target +TESTS+= cond-late +TESTS+= cond-op +TESTS+= cond-op-and +TESTS+= cond-op-and-lint +TESTS+= cond-op-not +TESTS+= cond-op-or +TESTS+= cond-op-or-lint +TESTS+= cond-op-parentheses +TESTS+= cond-short +TESTS+= cond-token-number +TESTS+= cond-token-plain +TESTS+= cond-token-string +TESTS+= cond-token-var +TESTS+= cond-undef-lint +TESTS+= counter +TESTS+= counter-append +TESTS+= dep +TESTS+= dep-colon +TESTS+= dep-colon-bug-cross-file +TESTS+= dep-double-colon +TESTS+= dep-double-colon-indep +TESTS+= dep-duplicate +TESTS+= dep-exclam +TESTS+= dep-none +TESTS+= dep-op-missing +TESTS+= dep-percent +TESTS+= dep-var +TESTS+= dep-wildcards +TESTS+= depsrc +TESTS+= depsrc-end +TESTS+= depsrc-exec +TESTS+= depsrc-ignore +TESTS+= depsrc-made +TESTS+= depsrc-make +TESTS+= depsrc-meta +TESTS+= depsrc-nometa +TESTS+= depsrc-nometa_cmp +TESTS+= depsrc-nopath +TESTS+= depsrc-notmain +TESTS+= depsrc-optional +TESTS+= depsrc-phony +TESTS+= depsrc-precious +TESTS+= depsrc-recursive +TESTS+= depsrc-silent +TESTS+= depsrc-use +TESTS+= depsrc-usebefore +TESTS+= depsrc-usebefore-double-colon +TESTS+= depsrc-wait +TESTS+= deptgt +TESTS+= deptgt-begin +TESTS+= deptgt-begin-fail +TESTS+= deptgt-begin-fail-indirect +TESTS+= deptgt-default +TESTS+= deptgt-delete_on_error +TESTS+= deptgt-end +TESTS+= deptgt-end-fail +TESTS+= deptgt-end-fail-all +TESTS+= deptgt-end-fail-indirect +TESTS+= deptgt-end-jobs +TESTS+= deptgt-error +TESTS+= deptgt-ignore +TESTS+= deptgt-interrupt +TESTS+= deptgt-main +TESTS+= deptgt-makeflags +TESTS+= deptgt-no_parallel +TESTS+= deptgt-nopath +TESTS+= deptgt-notparallel +TESTS+= deptgt-objdir +TESTS+= deptgt-order +TESTS+= deptgt-path +TESTS+= deptgt-path-suffix +TESTS+= deptgt-phony +TESTS+= deptgt-posix +TESTS+= deptgt-precious +TESTS+= deptgt-shell +TESTS+= deptgt-silent +TESTS+= deptgt-silent-jobs +TESTS+= deptgt-stale +TESTS+= deptgt-suffixes +TESTS+= dir +TESTS+= dir-expand-path +TESTS+= directive +TESTS+= directive-dinclude +TESTS+= directive-elif +TESTS+= directive-elifdef +TESTS+= directive-elifmake +TESTS+= directive-elifndef +TESTS+= directive-elifnmake +TESTS+= directive-else +TESTS+= directive-endfor +TESTS+= directive-endif +TESTS+= directive-error +TESTS+= directive-export +TESTS+= directive-export-env +TESTS+= directive-export-impl +TESTS+= directive-export-gmake +TESTS+= directive-export-literal +TESTS+= directive-for +TESTS+= directive-for-break +TESTS+= directive-for-empty +TESTS+= directive-for-errors +TESTS+= directive-for-escape +TESTS+= directive-for-generating-endif +TESTS+= directive-for-if +TESTS+= directive-for-lines +TESTS+= directive-for-null +TESTS+= directive-hyphen-include +TESTS+= directive-if +TESTS+= directive-if-nested +TESTS+= directive-ifdef +TESTS+= directive-ifmake +TESTS+= directive-ifndef +TESTS+= directive-ifnmake +TESTS+= directive-include +TESTS+= directive-include-fatal +TESTS+= directive-include-guard +TESTS+= directive-info +TESTS+= directive-misspellings +TESTS+= directive-sinclude +TESTS+= directive-undef +TESTS+= directive-unexport +TESTS+= directive-unexport-env +TESTS+= directive-warning +TESTS+= dollar +TESTS+= doterror +TESTS+= dotwait +TESTS+= error +TESTS+= # escape # broken by reverting POSIX changes +TESTS+= export +TESTS+= export-all +TESTS+= export-env +TESTS+= export-variants +TESTS+= gnode-submake +TESTS+= hanoi-include +TESTS+= impsrc +TESTS+= include-main +TESTS+= job-flags +TESTS+= job-output +TESTS+= job-output-long-lines +TESTS+= job-output-null +TESTS+= jobs-empty-commands +TESTS+= jobs-empty-commands-error +TESTS+= jobs-error-indirect +TESTS+= jobs-error-nested +TESTS+= jobs-error-nested-make +TESTS+= lint +TESTS+= make-exported +TESTS+= meta-cmd-cmp +TESTS+= meta-output +TESTS+= moderrs +TESTS+= modmisc +.if ${.MAKE.UID} > 0 +TESTS+= objdir-writable +.endif +TESTS+= opt +TESTS+= opt-backwards +TESTS+= opt-chdir +TESTS+= opt-debug +TESTS+= opt-debug-all +TESTS+= opt-debug-archive +TESTS+= opt-debug-curdir +TESTS+= opt-debug-cond +TESTS+= opt-debug-dir +TESTS+= opt-debug-errors +TESTS+= opt-debug-errors-jobs +TESTS+= opt-debug-file +TESTS+= opt-debug-for +TESTS+= opt-debug-graph1 +TESTS+= opt-debug-graph2 +TESTS+= opt-debug-graph3 +TESTS+= opt-debug-hash +TESTS+= opt-debug-jobs +TESTS+= opt-debug-lint +TESTS+= opt-debug-loud +TESTS+= opt-debug-meta +TESTS+= opt-debug-making +TESTS+= opt-debug-no-rm +TESTS+= opt-debug-parse +TESTS+= opt-debug-suff +TESTS+= opt-debug-targets +TESTS+= opt-debug-varraw +TESTS+= opt-debug-var +TESTS+= opt-debug-x-trace +TESTS+= opt-define +TESTS+= opt-env +TESTS+= opt-file +TESTS+= opt-ignore +TESTS+= opt-include-dir +TESTS+= opt-jobs +TESTS+= opt-jobs-internal +TESTS+= opt-jobs-no-action +TESTS+= opt-keep-going +TESTS+= opt-keep-going-indirect +TESTS+= opt-keep-going-multiple +TESTS+= opt-m-include-dir +TESTS+= opt-no-action +TESTS+= opt-no-action-at-all +TESTS+= opt-no-action-runflags +TESTS+= opt-no-action-touch +TESTS+= opt-query +TESTS+= opt-raw +TESTS+= opt-silent +TESTS+= opt-touch +TESTS+= opt-touch-jobs +TESTS+= opt-tracefile +TESTS+= opt-var-expanded +TESTS+= opt-var-literal +TESTS+= opt-version +TESTS+= opt-warnings-as-errors +TESTS+= opt-where-am-i +TESTS+= opt-x-reduce-exported +TESTS+= order +TESTS+= parse +TESTS+= parse-var +TESTS+= phony-end +TESTS+= posix +TESTS+= posix-execution +TESTS+= posix-expansion +TESTS+= posix-varassign +TESTS+= # posix1 # broken by reverting POSIX changes +TESTS+= recursive +TESTS+= sh +TESTS+= sh-dots +TESTS+= sh-errctl +TESTS+= sh-flags +TESTS+= sh-jobs +TESTS+= sh-jobs-error +TESTS+= sh-leading-at +TESTS+= sh-leading-hyphen +TESTS+= sh-leading-plus +TESTS+= sh-meta-chars +TESTS+= sh-multi-line +TESTS+= sh-single-line +TESTS+= shell-csh +TESTS+= shell-custom +.if exists(/bin/ksh) +TESTS+= shell-ksh +.endif +TESTS+= shell-sh +TESTS+= suff +TESTS+= suff-add-later +TESTS+= suff-clear-regular +TESTS+= suff-clear-single +TESTS+= suff-incomplete +TESTS+= suff-lookup +TESTS+= suff-main +TESTS+= suff-main-several +TESTS+= suff-phony +TESTS+= suff-rebuild +TESTS+= suff-self +TESTS+= suff-transform-debug +TESTS+= suff-transform-endless +TESTS+= suff-transform-expand +TESTS+= suff-transform-select +TESTS+= suff-use +TESTS+= sunshcmd +TESTS+= ternary +TESTS+= unexport +TESTS+= unexport-env +TESTS+= use-inference +TESTS+= var-readonly +TESTS+= var-scope +TESTS+= var-scope-cmdline +TESTS+= var-scope-env +TESTS+= var-scope-global +TESTS+= var-scope-local +TESTS+= var-scope-local-legacy +TESTS+= var-eval-short +TESTS+= var-op +TESTS+= var-op-append +TESTS+= var-op-assign *** 608 LINES SKIPPED *** From nobody Wed Dec 3 19:55:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM7f86cTqz6HhsS for ; Wed, 03 Dec 2025 19:55: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM7f82lVCz46Zs for ; Wed, 03 Dec 2025 19:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ejW3Dq/6PR8Jk3K9spBIBG3rdlWayUVnXLDeFEol1M=; b=QCnY2Qswo8H8gMXSMQHSFKOvQi6uU988q5SZHjaQ35zsRC5T9pjhE4BAzWkM1lw8pgkzsz jeNUiQe92crQy9FRqInpTXbEsytN0A6LOIsm38VEnZgyMPWTiTgf+Wt1c8UciyEqqu86Q+ w+EXoPGqTs5lfwwg/K6N4Ffbt0Kpfy7JQYGEB+yyBcyfCftcdFsUanIYqpUMXxAalQuCw4 0yLfcE0VKSHLGJwmZ4miUFFvt1ViY7xRYQGxS1QzBO36QhuB3cSL+67o2PjnPuyoS9ZNX+ NIPt6fya2H9t/7+66vNATaXzx/p1ZtUhQeOy8SKIjkg0b7CQ1d50pyAQNvpP0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ejW3Dq/6PR8Jk3K9spBIBG3rdlWayUVnXLDeFEol1M=; b=RjccbEhE5dLiSHuUTZk1p+w6n+chZ05/XuXYJ+KS9jlDNt7W3s+tR+Bzn2/tDkI/YzOv1o iJcoeEKkBzgqk2dfJOa2k23qmOJ0/S3X5l8xEUolTtuK0+s1LLGwV0NItQVw0SZ0Lw8my1 TIsZFs1r0IKk4iVMFl/HvQKw61GIKCJwY9Pfsw0dIa9KtKrA9BVX3w2KJ44yIjZkpy4E0f bpcH0c5xJ7OJA5p1xq0OdBhd4YVg/AlUdz3o9xNUaz/wBc1g/dGRkfCIiNJhuNS6A9A8g3 SMbRJMMLLAWl448FVLBaxcnAilO/WkKY+F4y59m0RMy4o6669iONkVCXvVd4fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764791712; a=rsa-sha256; cv=none; b=p/TlvtY0fVPfnF2qqrRjm6vRe/qylbaIC1hQedP+xDOqbCLqIzNXe3slzcenLy+c9Wi235 4qyefM9fRzYjyEENv87SfyWg9K0hc45rLCxhNHPCwS6zucmlwgfv96vEX3mkwEixgmX1/a vLGlcyLPjWqbR9JkKwbTwB0zu7ROb+B45p18eDiOwW/VOoghrM9ZgJst9Jt/8TuRDqXpq8 4oe/uPj/NUr9BBW7YvMmZBy4TvqIwjHjeLanXeP89HbKZ/ujWcPUy/sRvg9yHwLmec4cZq O7zg/Wom8lsSin5W9A6xpjkPibPBqDv1YovvGjs81Tk8GhFnkM2cv8p5t1iD+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM7f82DyszsSB for ; Wed, 03 Dec 2025 19:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ac3c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 19:55:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: af22833348c6 - main - LinuxKPI: 802.11: fill in more skeleton functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af22833348c6c7ffed0186651437b5f50be1550b Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 19:55:12 +0000 Message-Id: <693095a0.2ac3c.4cd0a2a8@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=af22833348c6c7ffed0186651437b5f50be1550b commit af22833348c6c7ffed0186651437b5f50be1550b Author: Bjoern A. Zeeb AuthorDate: 2025-11-29 03:19:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-03 19:54:43 +0000 LinuxKPI: 802.11: fill in more skeleton functions Some of these are used by mt76 and while I was here and it only was a handfull I figured I should just clean this all up. There is one problem in that between 802.11az and 802.11-2024 action frame formats have changed; I got compile errors from iwlwifi(4) given I updated them to -2024 so we remain on older versions for the moment. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- .../linuxkpi/common/include/linux/ieee80211.h | 168 +++++++++++++++++---- sys/compat/linuxkpi/common/include/net/cfg80211.h | 4 + 2 files changed, 141 insertions(+), 31 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index ea8c0fc8ef5e..12160df43915 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -43,8 +43,13 @@ extern int linuxkpi_debug_80211; #ifndef D80211_TODO #define D80211_TODO 0x1 #endif +#ifndef D80211_IMPROVE +#define D80211_IMPROVE 0x2 +#endif #define TODO(fmt, ...) if (linuxkpi_debug_80211 & D80211_TODO) \ printf("%s:%d: XXX LKPI80211 TODO " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) +#define IMPROVE(fmt, ...) if (linuxkpi_debug_80211 & D80211_IMPROVE) \ + printf("%s:%d: XXX LKPI80211 IMPROVE " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) /* 9.4.2.55 Management MIC element (CMAC-256, GMAC-128, and GMAC-256). */ @@ -568,17 +573,25 @@ struct ieee80211_mgmt { uint8_t tpc_elem_tx_power; uint8_t tpc_elem_link_margin; } __packed tpc_report; - /* 9.6.8.33 Fine Timing Measurement frame format */ + /* 802.11-2024, 9.6.7.32 FTM Request frame format */ + struct { + uint8_t public_action; + uint8_t trigger; + uint8_t variable[0]; + } __packed ftmr; + /* 802.11az-2022, 9.6.7.33 Fine Timing Measurement (FTM) frame format */ + /* XXX CHANGED IN 802.11-2024, 9.6.7.33 Fine Timing Measurement frame format */ struct { - uint8_t dialog_token; - uint8_t follow_up; - uint8_t tod[6]; - uint8_t toa[6]; + uint8_t public_action; + uint8_t dialog_token; + uint8_t follow_up; + uint8_t tod[6]; + uint8_t toa[6]; uint16_t tod_error; uint16_t toa_error; uint8_t variable[0]; } __packed ftm; - /* 802.11-2016, 9.6.5.2 ADDBA Request frame format */ + /* 802.11-2024, 9.6.4.2 ADDBA Request frame format */ struct { uint8_t action_code; uint8_t dialog_token; @@ -588,9 +601,12 @@ struct ieee80211_mgmt { /* Optional follows... */ uint8_t variable[0]; } __packed addba_req; - /* XXX */ + /* 802.11-2024, 9.6.13.3 Event Report frame format */ struct { + uint8_t wnm_action; uint8_t dialog_token; + /* Optional follows... */ + uint8_t variable[0]; } __packed wnm_timing_msr; } u; } __packed action; @@ -1087,24 +1103,42 @@ ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) struct ieee80211_mgmt *mgmt; __le16 fc; + KASSERT(skb->len >= sizeof(fc), ("%s: skb %p short len %d\n", + __func__, skb, skb->len)); + mgmt = (struct ieee80211_mgmt *)skb->data; fc = mgmt->frame_control; - /* 11.2.2 Bufferable MMPDUs, 80211-2020. */ - /* XXX we do not care about IBSS yet. */ + /* 11.2.2 Bufferable MMPDUs, 802.11-2024. */ + IMPROVE("XXX IBBS"); if (!ieee80211_is_mgmt(fc)) return (false); - if (ieee80211_is_action(fc)) /* XXX FTM? */ - return (true); /* XXX false? */ if (ieee80211_is_disassoc(fc)) return (true); if (ieee80211_is_deauth(fc)) return (true); + if (!ieee80211_is_action(fc)) + return (false); - TODO(); + /* + * Now we know it is an action frame, so we can check for a proper + * length before accessing any further data to check if it is an + * FTM/FTMR, which is non-bufferable. + * 9.6.7.32 FTM Request frame format + * 9.6.7.33 FTM frame format + */ + if (skb->len < offsetofend(typeof(*mgmt), u.action.u.ftm.public_action)) + return (false); - return (false); + if (mgmt->u.action.category != IEEE80211_ACTION_CAT_PUBLIC) + return (false); + + if (mgmt->u.action.u.ftm.public_action == 33 || /* FTM xxx defines? */ + mgmt->u.action.u.ftmr.public_action == 32) /* FTMR xxx defines? */ + return (false); + + return (true); } static __inline bool @@ -1207,53 +1241,125 @@ ieee80211_get_DA(struct ieee80211_hdr *hdr) return (hdr->addr1); } +static __inline bool +ieee80211_has_morefrags(__le16 fc) +{ + + fc &= htole16(IEEE80211_FC1_MORE_FRAG << 8); + return (fc != 0); +} + static __inline bool ieee80211_is_frag(struct ieee80211_hdr *hdr) { - TODO(); - return (false); + return (ieee80211_has_morefrags(hdr->frame_control) || + (hdr->seq_ctrl & htole16(IEEE80211_SEQ_FRAG_MASK)) != 0); } static __inline bool -ieee80211_is_first_frag(__le16 fc) +ieee80211_is_first_frag(__le16 seq_ctrl) { - TODO(); - return (false); + return ((seq_ctrl & htole16(IEEE80211_SEQ_FRAG_MASK)) == 0); } static __inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb) { - TODO(); - return (false); + struct ieee80211_mgmt *mgmt; + + if (skb->len < sizeof(mgmt->frame_control)) + return (false); + mgmt = (struct ieee80211_mgmt *)skb->data; + + /* 802.11-2024, 12.2.7 Requirements for management frame protection */ + + if (ieee80211_is_disassoc(mgmt->frame_control)) + return (true); + if (ieee80211_is_deauth(mgmt->frame_control)) + return (true); + + if (!ieee80211_is_action(mgmt->frame_control)) + return (false); + + /* + * If the action frame is a protected frame the peer has already + * decided that it is a robust mgmt frame. + * This is not exactly in the books but maintaining the below + * table will go out of sync eventually and this can save us. + */ + if (ieee80211_has_protected(mgmt->frame_control)) + return (true); + + /* + * 802.11-2024, 9.4.1.11 Action Fields, + * Table 9-81-Category values; check for the ones marked Robust: no. + */ + /* Check length again before accessing more data. */ + if (skb->len < offsetofend(typeof(*mgmt), u.action.category)) + return (false); + + switch (mgmt->u.action.category) { + case 4: /* Public */ + case 7: /* HT */ + case 11: /* Unprotected WNM */ + /* 12 */ /* TDLS */ + case 15: /* Self-protected */ + case 20: /* Unprotected DMG */ + case 21: /* VHT */ + case 22: /* Unprotected S1G */ + case 30: /* HE */ + case 127: /* Vendor-specific */ + return (false); + default: + return (true); + } } static __inline bool ieee80211_is_ftm(struct sk_buff *skb) { - TODO(); + struct ieee80211_mgmt *mgmt; + + /* First check length before accessing data. */ + if (skb->len < offsetofend(typeof(*mgmt), u.action.u.ftm.public_action)) + return (false); + + mgmt = (struct ieee80211_mgmt *)skb->data; + if (!ieee80211_is_action(mgmt->frame_control)) + return (false); + if (mgmt->u.action.category != IEEE80211_ACTION_CAT_PUBLIC) + return (false); + if (mgmt->u.action.u.ftm.public_action == 33) /* FTM xxx defines? */ + return (true); + return (false); } static __inline bool ieee80211_is_timing_measurement(struct sk_buff *skb) { - TODO(); - return (false); -} + struct ieee80211_mgmt *mgmt; + + /* First check length before accessing data. */ + if (skb->len < offsetofend(typeof(*mgmt), u.action.u.wnm_timing_msr.wnm_action)) + return (false); + + mgmt = (struct ieee80211_mgmt *)skb->data; + if (!ieee80211_is_action(mgmt->frame_control)) + return (false); + + if (mgmt->u.action.category != IEEE80211_ACTION_CAT_UNPROTECTED_WNM) + return (false); + if (mgmt->u.action.u.wnm_timing_msr.wnm_action == 1) /* Event Report xxx defines? */ + return (true); -static __inline bool -ieee80211_has_pm(__le16 fc) -{ - TODO(); return (false); } static __inline bool -ieee80211_has_morefrags(__le16 fc) +ieee80211_has_pm(__le16 fc) { - - fc &= htole16(IEEE80211_FC1_MORE_FRAG << 8); + fc &= htole16(IEEE80211_FC1_PWR_MGT << 8); return (fc != 0); } diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 305026b34451..d7ed2bc97c98 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -55,10 +55,14 @@ extern int linuxkpi_debug_80211; #ifndef D80211_IMPROVE #define D80211_IMPROVE 0x2 #endif +#ifndef TODO #define TODO(fmt, ...) if (linuxkpi_debug_80211 & D80211_TODO) \ printf("%s:%d: XXX LKPI80211 TODO " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) +#endif +#ifndef IMPROVE #define IMPROVE(fmt, ...) if (linuxkpi_debug_80211 & D80211_IMPROVE) \ printf("%s:%d: XXX LKPI80211 IMPROVE " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) +#endif enum rfkill_hard_block_reasons { RFKILL_HARD_BLOCK_NOT_OWNER = BIT(0), From nobody Wed Dec 3 19:55:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fB6Cldz6Hhw5 for ; Wed, 03 Dec 2025 19:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM7fB3zyhz46d0 for ; Wed, 03 Dec 2025 19:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SamLI61XF9m1wThqAhYxaemT164bJKyiMRzVXOQq3II=; b=TtCHzOo75Ne1h6hoobB6PccxMGBQldCQQKSaFTp7XyJZ0DlDcw594/tKa8NyHr8aOC0iX/ nr6aGDWzPVrGcPevff+XuO0F0qVSpaO0yHj9HUbakx6Jv/qc8kdLi8kNNG62LNC8Iz+cFC cwgSD8UNmtKMijd5l1dEqryREtf2A9WV4+jRmEQJeGn1w0IF5YD4FOIrPM0XPO2JcDBUK/ hlwodHfC+1c+oxdwvKTOBNaEHu3ZdGV6Fvp2KhEiy+p/meUV/vZ6dQTgJw7yCd7F0CqQsv yDmvZo/PyG1kV+DplmUB2IfDLp6S6FBw/hWLNb8TINUkvTg/coJJfPGEL5Rx3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SamLI61XF9m1wThqAhYxaemT164bJKyiMRzVXOQq3II=; b=tZ/8AlAX/l6Af2HHQe5WB4JB7UOBPGvY3a+LZ/Q1IOCVTVJnUBOEU9kxsfuAfr5TBzvQP5 MV/VEJ3PrXi9omNV73AK/taRf4z54c6WB+iAmSSa0Vt/vLfv/Md2s/esemMfIXpxU5sfT/ JJAl1vAPhJa8MFam3Qu4Ds3V5SP40VRnC3ID+sznwJMBEsE8VVkUWf9jfVwGcc+x6968Sm juK0KC+PGAn8tAE2UcGbOj5NsG8nL3MGrDF2FkaoIRU5+l3QzkrEKRDUhdUl15LBMiTIUo IwIoslec/Gy0hhXUSHUgYWwIERuv1bL70ZbaNu/G7CF9S0a7d+42TyuMVThL3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764791714; a=rsa-sha256; cv=none; b=BLrjP/5zimCIEoPotCCkaqWeYn0wSGxXCEEVMEgdwpHiFb4M06HStjYTw5Uq27JbdicNjF 787zfpXiRPPVQR4gWz7LzMmUFgMxXR6ENP/rPTXINgJM/RmRtVbDT8juXzPKf2aZgMDK+Z NrX0JYYZ3xRrNAC2KY+liYJ91sFcRjtjClgU/tH5BFdPYZkpu8xWKSHnqwo258Mjtt3YsL 3dR3miLZhacgMW0gJ8OQCWhDA8uWfuP3OW3HJTkXE7h5Q/OCzlTSN9k6IikjmiS5HinPgX iGyYyKrZ+FXYmd2s2af/jiVaWd16Y/jVeG6UiCaJcBGw4r6C5kqQYxxuft40KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fB3Qgwzs2M for ; Wed, 03 Dec 2025 19:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 29ebe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 19:55:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 51c73fc5f5dd - main - LinuxKPI: mt76: depend on CONFIG_NET_MEDIATEK_SOC_WED List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51c73fc5f5dd95c6a0e3d232091a732a14c7ecc9 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 19:55:14 +0000 Message-Id: <693095a2.29ebe.d579fc0@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=51c73fc5f5dd95c6a0e3d232091a732a14c7ecc9 commit 51c73fc5f5dd95c6a0e3d232091a732a14c7ecc9 Author: Bjoern A. Zeeb AuthorDate: 2025-11-25 17:20:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-03 19:54:44 +0000 LinuxKPI: mt76: depend on CONFIG_NET_MEDIATEK_SOC_WED If CONFIG_NET_MEDIATEK_SOC_WED is not set then be silent; if CONFIG_NET_MEDIATEK_SOC_WED is set we will enable logic or rather te pr_debug("TODO") calls for now. Spsonsored by: The FreeBSD Foundation MFC after: 3 days --- .../common/include/linux/soc/mediatek/mtk_wed.h | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h index 9f3a1ee4c139..2b9c6ae4911e 100644 --- a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h +++ b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h @@ -14,6 +14,7 @@ struct mtk_wed_device { #define WED_WO_STA_REC 0x6 +#if defined(CONFIG_NET_MEDIATEK_SOC_WED) #define mtk_wed_device_start(_dev, _mask) do { pr_debug("%s: TODO\n", __func__); } while(0) #define mtk_wed_device_detach(_dev) do { pr_debug("%s: TODO\n", __func__); } while(0) #define mtk_wed_device_irq_get(_dev, _mask) 0 @@ -29,7 +30,6 @@ struct mtk_wed_device { static inline bool mtk_wed_device_active(struct mtk_wed_device *dev __unused) { - pr_debug("%s: TODO\n", __func__); return (false); } @@ -42,4 +42,30 @@ mtk_wed_get_rx_capa(struct mtk_wed_device *dev __unused) return (false); } +#else /* ! CONFIG_NET_MEDIATEK_SOC_WED */ + +#define mtk_wed_device_start(_dev, _mask) do { } while(0) +#define mtk_wed_device_detach(_dev) do { } while(0) +#define mtk_wed_device_irq_get(_dev, _mask) 0 +#define mtk_wed_device_irq_set_mask(_dev, _mask) do { } while(0) +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) -ENODEV +#define mtk_wed_device_dma_reset(_dev) do { } while (0) +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _entry) do { } while (0) +#define mtk_wed_device_stop(_dev) do { } while(0) +#define mtk_wed_device_start_hw_rro(_dev, _mask, _b) do { } while(0) +#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _tdata) -EOPNOTSUPP + +static inline bool +mtk_wed_device_active(struct mtk_wed_device *dev __unused) +{ + return (false); +} + +static inline bool +mtk_wed_get_rx_capa(struct mtk_wed_device *dev __unused) +{ + return (false); +} +#endif /* CONFIG_NET_MEDIATEK_SOC_WED */ + #endif /* _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H */ From nobody Wed Dec 3 19:55:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fD0Gnmz6Hj0p for ; Wed, 03 Dec 2025 19:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM7fC4Xgjz46pX for ; Wed, 03 Dec 2025 19:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v3euOSdTJ/8O3tOEsgOGQ1pOhKQd0I6UB5ZoJs55UkI=; b=RKU9c/rzw+Eb2QAYTCGrfEdaazvBHOF89orwoFkVRmAsoM80kaKHc+KLTo0fe83b+Fq7Ru 8BRLDje7PuFc2lEJ8sLG1IAD2Le9fEbTKLlSnlw3dJPLvPXg++nRPioIYmU3TWTEsxQNYI mJlnofcaQaaww/RNLHJEuXiDJyvG2au3qhJ8inpN/bkiBG1E9YU+EWBZ3eG7s6VcbFAdQb RcslDcQQd2xgfm+8vSUwcR7YCm3DJu32VxERaHp6Yb/Y2SaVP99oYaBMh8oyYgT659OZ1F b8CMcWVsTiady5iKQvKklEP+Rj95Dm0xVy/HCBgrTonHv8LXLFOro4qgmpZV6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v3euOSdTJ/8O3tOEsgOGQ1pOhKQd0I6UB5ZoJs55UkI=; b=lfib9VaOxtWzaNtnWcEzpyDMl80q3a8J8x3sPubuLK2cSwwdJjftpRCno9wRgUu/4vYfLr AMr/sMwZPSt0EaVANZooam7BuNEOxWVnAJH/ctG5Bl//Hs0JN5GXw0QQ79ph3q/ZtFXeLP TAzPm/85rrdeOcZnY/j59PUXTYVwcj+RxY9cusWvcHzpilnuhhGOjdiD0ZYlrrMCScx7L2 BFGkHSog0SzHyqP00TACx5LoJHmbt0+TZ+/Sgbd3obHt+kLdxRMeERQZabn0sQMeDiANKN OpW1U5S7sbJqurV40YuAKmM9K1G8Rrnhv7ce0DeGyi7FgKCopGvlFaCm8Ow4bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764791715; a=rsa-sha256; cv=none; b=n1mRVRXTvgg4S6hBnWqJ0qpB1naJQkVJkBFZld/U63wVphnE9CrMfHaEBHjWYx22104Ho6 vSZ8Rnldq1OR6/9Z88jynjY8Rby5vMcgqfSL55N3U9bpXjiC9R7djfdhoPH/RBcs9Yd/17 VCyFbzR0/6Lyu7klGPfOS2JV0ssojLB1TzWAq3C4dytE+KipBsKtvyuv2P/AaYbc8JvX7J yeaJ2N7nKsVx8/nJRjPNCcf35qjBDAvtpxbsuwAceuoQm7AxJBpphZ6e2FNNYAOwPfqDjR WeFGBxi3Ihqe0gT383jpQbKLf/dsCi5A04XIvl3/bLE9VkRwVcnmRcARYTxIiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fC45l2zsMx for ; Wed, 03 Dec 2025 19:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2af13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 19:55:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 87aa494dfca7 - main - mt76: set appropriate CONFIG options for the module build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87aa494dfca73204516799033821ab1db184933f Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 19:55:15 +0000 Message-Id: <693095a3.2af13.1060047b@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=87aa494dfca73204516799033821ab1db184933f commit 87aa494dfca73204516799033821ab1db184933f Author: Bjoern A. Zeeb AuthorDate: 2025-11-25 17:16:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-03 19:54:44 +0000 mt76: set appropriate CONFIG options for the module build Always set CONFIG_ARCH_DMA_ADDR_T_64BIT as it is true for all architectures we support. Add an option for CONFIG_NET_MEDIATEK_SOC_WED, which we currently do not yet support. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/mt76/Makefile.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc index 35a8e34f14d3..44aa94c954a8 100644 --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -6,11 +6,15 @@ COMMONDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76 WITH_CONFIG_PM= 0 WITH_DEBUGFS= 0 +WITH_SOC_WED= 0 # Other SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h +# This is true for all architectures we build for. +CFLAGS+= -DCONFIG_ARCH_DMA_ADDR_T_64BIT + # Helpful after fresh imports. #CFLAGS+= -ferror-limit=0 @@ -22,8 +26,13 @@ CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} .endif +.if defined(WITH_SOC_WED) && ${WITH_SOC_WED} > 0 +CFLAGS+= CONFIG_NET_MEDIATEK_SOC_WED +.endif + CFLAGS+= -I${COMMONDIR} CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DLINUXKPI_VERSION=61700 + # end From nobody Wed Dec 3 19:55:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fF15xlz6Hhl2 for ; Wed, 03 Dec 2025 19:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM7fD5NWWz46k8 for ; Wed, 03 Dec 2025 19:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gteslZzMTf0javO8InDHNO3kBvh9MlF0T5/2RPPUPrQ=; b=d242nHEFKlwBbzFC+Dk108TdPE9mi3vNhB25KfWMdtKxSgr88R3IWFgxcQmVlW67c/hb3g dZIoofUWoIs5xtxpz+mFIH7kN1/i4GuE2A8T8X5/T/y1aDCPCC5WmXhp+WezgYUKShgFlq JeQlI7qF9Xk/s0akisy05H9R7Nz8Z8Fz4yuTUU0xCgQy8C43KBHgmu6Ji3MjFC83SeEAH0 j5CZ8rwW/rEXTYmzLS0o30bgdBIEqVXmk3yU36A52TNk9l6C3htjrqIJuIMPlMAR/4Dxv6 tMFRekRyiJ+UI5iA2OF5F5Lwg5YG07zDHTEb5r8oVL4SLMknwATeNtAh57puOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gteslZzMTf0javO8InDHNO3kBvh9MlF0T5/2RPPUPrQ=; b=JbwlKRy7m06JUQr84Oi6bG9T5qkLafuPR2m+8DjMm/o9dM9RxQN7MsQ8/dIaY4OrsqpB5g 47xwek0nE1y/vjDLHVpquXtU3gpBVAbzLAkaanS7QFYmf2bHjdxCutxdZkV9Rz2Q7IaIih KJpSfMLT1sYTH6RmOd1SGAsVJEIcRZ8G+Vst5rm6u52FBNovUc933G0MdoVkNCL6n+zXqV wSx8mlkHYlVKWw8VKq37fhgx8CQxIA40Ho+IPvbR1iydq7ngRhKnH4DhRbEfzImxM/Tf7h 5wu4bQP+Ja9WXyQ8FNPFfnvnhYHBHwMvu1AV3QvBRegPsvmZ75k+XeIzh3rMJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764791716; a=rsa-sha256; cv=none; b=w6MVjH4t3xO/2Rk4uZnlJREl04SMY9Uhzdw4v3KXN9dIb9bsnZcHKeKG5n3MguDfUTCtqq /Av99sK9O5I9u5AnsCnVxxNTQvvngJDvMbzq3pxg39w1Wxg2K6lBncOyLKtzjVo+xIMnHX sMzPN7rtIOej4DAatAhD1WPhKaf7weC9DgCAK9BRKxM/JoVYERg0LIyVc7LzqtZZuU/Vhi tkNIFatW6YdIx9JnhrBc3JcjI43dCdVmBdH71+1GluCWGIrix1cZyFr2rX3cgQLSeJJTtn Vk+m6nsXwz43TiumqgOT+nXMC4fb/sxo3nwrInJRaM7jAqlx2JXO7eqBZxmFVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fD4rrmzsVf for ; Wed, 03 Dec 2025 19:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2acb2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 19:55:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c67fd35e58c6 - main - mt76: ieee80211_is_first_frag() operates on the seq_ctrl field not on fc. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c67fd35e58c6ee1e19877a7fe5998885683abedc Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 19:55:16 +0000 Message-Id: <693095a4.2acb2.68fc6a6b@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c67fd35e58c6ee1e19877a7fe5998885683abedc commit c67fd35e58c6ee1e19877a7fe5998885683abedc Author: Bjoern A. Zeeb AuthorDate: 2025-11-29 00:51:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-03 19:54:44 +0000 mt76: ieee80211_is_first_frag() operates on the seq_ctrl field not on fc. Pass the correct field to ieee80211_is_first_frag(); otherwise the results may vary. Sponsored by: The FreeBSD Foundation MFC after: 3 days X-To-Upstream: yes --- sys/contrib/dev/mediatek/mt76/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/dev/mediatek/mt76/mac80211.c b/sys/contrib/dev/mediatek/mt76/mac80211.c index 927d8519104f..d2ace8870451 100644 --- a/sys/contrib/dev/mediatek/mt76/mac80211.c +++ b/sys/contrib/dev/mediatek/mt76/mac80211.c @@ -1340,7 +1340,7 @@ mt76_check_ccmp_pn(struct sk_buff *skb) * All further fragments will be validated by mac80211 only. */ if (ieee80211_is_frag(hdr) && - !ieee80211_is_first_frag(hdr->frame_control)) + !ieee80211_is_first_frag(hdr->seq_ctrl)) return; } From nobody Wed Dec 3 19:55:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fG2vCYz6Hhl4 for ; Wed, 03 Dec 2025 19:55: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM7fF63Cqz46mp for ; Wed, 03 Dec 2025 19:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=912XHzbbQ1alSOKoLHwNw4QTwFzXwuKfjs4jwHNXtD4=; b=Tu7iNTsyoSG7nkWdNksdmF14ppz8ImXjD3ommyLoiNIRgxCQ7XhcWU6wpETJ/OUhsfUi+a fE0wZFnSTdK/YUQsUJ4bU1ndlhET7dViu2mdYvgM+65VT1ozi8u1F6TET1n+jFLONe5cjn G29DRp23WWwz1PrXfOC6T6iEMVBY/7cGoPJMOpO4Fp6rUhaZfHvr1/AZ3+U/1M5Asu1vAX 1wLvvzpSFfwD441y9STUhQ5bj8lTHfstPd/odugyakFa0jng96sjV/g5BN8ZORxRVB7OUW DhF4AnR/fqZNnAy0bciUspWwxaXUU1NqIZU1PAmZE3TL/UeF1MYYOZd6otl4bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=912XHzbbQ1alSOKoLHwNw4QTwFzXwuKfjs4jwHNXtD4=; b=edO/rpv0VjeOzALV1OdzBSyQHBy8UiLL2/dG9wVlOkQaG0CB+bmz6KJYtdqbsDfzmD1UG4 J/UNN1AeWuBB926jyluHcmUXghWEH9oZCEy1QCvl2PHWlQSowozOtzqO4or1eRHkgvFG6J RHbIplYIM6mRGScf67SqyLTCDWR+Ip2VVlOuWo5jGXGT1uPS8eg9NIRplo13VspsNth66g P2pg5d3rTRtu/UxZkR/XkSV6cwKL3RdCNOttykfoUdVrCT+iPcgCRBw8RTQt7HH58P0z7a UuubS3RKYFnaRFEPGZ3t40DDRkp0iGZnqw+7W3UZT5una2rXMMbacYAZqxlcbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764791717; a=rsa-sha256; cv=none; b=kFxrWBoM7khL1TNlTUuBcpmDoP3NI8c8R8xe2A5gHaIKxTmsFnUFSKgEBoevOPUZW329tH V81ypiTT/KEHWb6I/PmDsgKhxnahw8OWKeSiXPVYro1+EsoXygpEfjA/VODTZOmDZBNZWl DXaY1p+I4D1INhCs8ut9bTFACs2ssAJYF7Z9JfrVt9GFqQHNPlyJWrPbxNyZWlHe0vnV+h 5+vKo0Y2CepjlJlP77B2DFKz6u6G6hXgeVSt/2EobNI263+y212EZla/XDenN8Rj6OoKqf /lDSTSGU/9/Cje/EY5PHNfox5+w5d3rQaFE5Cvqc4+eJVeIwuAtWyh27ThDoCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fF5bKjzsMy for ; Wed, 03 Dec 2025 19:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 29ec2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 19:55:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9492230fd3d1 - main - mt76: util.h: extend worker name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9492230fd3d1e58696e9fd99cb9680b27bf1d424 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 19:55:17 +0000 Message-Id: <693095a5.29ec2.5d8349fa@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9492230fd3d1e58696e9fd99cb9680b27bf1d424 commit 9492230fd3d1e58696e9fd99cb9680b27bf1d424 Author: Bjoern A. Zeeb AuthorDate: 2025-12-03 01:01:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-03 19:54:44 +0000 mt76: util.h: extend worker name In mt76_worker_setup() add the "name" argument to the description for the worker thread. That way we have a chance to keep them apart. While here, rename a variable and shorten the the (c)/SPDX section according to new style. MFC after: 3 days --- sys/contrib/dev/mediatek/mt76/util.h | 39 ++++++++---------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/sys/contrib/dev/mediatek/mt76/util.h b/sys/contrib/dev/mediatek/mt76/util.h index f6c0ecaf33e6..73a784fe2707 100644 --- a/sys/contrib/dev/mediatek/mt76/util.h +++ b/sys/contrib/dev/mediatek/mt76/util.h @@ -1,30 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2020,2022-2023 Bjoern A. Zeeb - * - * 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. +/* + * Copyright (c) 2020-2025 Bjoern A. Zeeb * - * 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. - * - * $FreeBSD$ + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef _MT76_UTIL_H @@ -69,23 +46,23 @@ mt76_wcid_mask_clear(u32 *mask, u16 bit) /* See, e.g., __mt76_worker_fn for some details. */ static inline int -mt76_worker_setup(struct ieee80211_hw *hw, struct mt76_worker *w, +mt76_worker_setup(struct ieee80211_hw *hw __unused, struct mt76_worker *w, void (*wfunc)(struct mt76_worker *), const char *name) { - int rc; + int error; if (wfunc) w->fn = wfunc; w->task = kthread_run(__mt76_worker_fn, w, - "mt76-worker"); + "mt76-%s", name); if (!IS_ERR(w->task)) return (0); - rc = PTR_ERR(w->task); + error = PTR_ERR(w->task); w->task = NULL; - return (rc); + return (error); } static inline void From nobody Wed Dec 3 19:55:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fH24nkz6HhsZ for ; Wed, 03 Dec 2025 19:55: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM7fH0P9Pz46kd for ; Wed, 03 Dec 2025 19:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=II1MKJrdWypp5JbdX2MNPIQIDv7o5BpuZeL7+uVMW0c=; b=M9gFV/p0bJerovk6LsJQMxDyM/KXbcxNmYIUt1h3E+X54mO/+EH5C4/LA3K35svh1tA72Z LEg1fYw5YWVxgb2ScGDSNkvxRzPvbo/FQN8eAhDw0vQ6KfnBDZgo6RDiEcAP90eOYr0m+J 8eL4JGl5oLwfjRgA8R/PT8bhDHQsn04HqJ8gWIOF1Obod6XEb8kj4hD/WSMmGLiRxOwHv4 Qs3gzoCTAjDEuPip+cUMjUTm7OHkmVsXNIekZCAAgMPz+LLltZZa+dXBudDRYSXFSh1pkE fH5S99MFbJs2W8c7zmjTWXwgwNVZu+inPgCBhB0Ley0EhhMlMMY2nPgwUzUCxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764791719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=II1MKJrdWypp5JbdX2MNPIQIDv7o5BpuZeL7+uVMW0c=; b=gQt7KM1uHdczTvBjKrKsYGloZnjxBjR9lKPxU6+ZJNn4ieO/TTLLs0DMgdrF0HB82NoUmD txA1jACX1zFiZDs/w7vkqdTHk3rPW7R3d3x5ITam1u9ca8xSZpONkMIoC9hb9sovq7j4ov wNfY4aecTo37a9g+eVx5+hHSh+oakpomjHweq9iqoCpwAR0Y77Y+IFM2ffqZuUEDFZ/8XE vhRD6PY7CZpvD1hFZhb+jXZT4DQnA4/uJwZzQSIT/4Asf0nADdnJE4Rttp6nXy6qyFKrh8 N8jF+iSo3XixMGt61WY3WDewrwoNRjE+RMgiI/4Wwpfj6Ac4TtvYaFxe/UGkRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764791719; a=rsa-sha256; cv=none; b=pDuk/D4UWKYQrkRjhmtuaTlfBAZIUIzQsUqQfhbn845U5teCvcna8WStYVL1cS33FXtyZZ N0uTLIcZTTNCK+gvmhV8LfTOU9iPX/KxpSY8GTgUBxOGLdYUKCsmiUhMxU0fT4eNFsxuIU ambReYpd7trVLmApNIBRcCPvLqDY2JZ6pYlGW2ryAXAECWDijS/2dMJJrRxrOzw0ymHtt9 EH0YceVkns35yW9Lb7iBCXeZgotvTcxQtTFVxHLsc3TnuQIn+Ix0zJ+lMfRF7345GRerRL IpJWTBWdM8sY7HIPwYJQIiC9A2uLns+Jz5btxltrcJC9TbSdUFyqNcLVNiBDfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM7fG6TLnzrhx for ; Wed, 03 Dec 2025 19:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2bb92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 19:55:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 853e0440c97a - main - mt76: add LINUXKPI_PARAM_PREFIX for module_param* List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 853e0440c97a4a1797edd6d653fba4398dc885e8 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 19:55:18 +0000 Message-Id: <693095a6.2bb92.5d561dbe@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=853e0440c97a4a1797edd6d653fba4398dc885e8 commit 853e0440c97a4a1797edd6d653fba4398dc885e8 Author: Bjoern A. Zeeb AuthorDate: 2025-12-03 01:05:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-03 19:54:45 +0000 mt76: add LINUXKPI_PARAM_PREFIX for module_param* In order to not overwrite sysctl/tunables under compat.linuxkpi we need to prefix the module_param* names with a per-driver/file designator to make them (more) uniq. Add the FreeBSD specific LINUXKPI_PARAM_PREFIX defines for that where missing in mt76. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/mediatek/mt76/mt7915/coredump.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7915/mcu.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7915/mmio.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7921/mcu.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7925/mcu.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7925/pci.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7996/coredump.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7996/mcu.c | 4 ++++ sys/contrib/dev/mediatek/mt76/mt7996/mmio.c | 4 ++++ sys/contrib/dev/mediatek/mt76/usb.c | 4 ++++ 11 files changed, 44 insertions(+) diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/coredump.c b/sys/contrib/dev/mediatek/mt76/mt7915/coredump.c index 5daf2258dfe6..8c9a69837c86 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7915/coredump.c +++ b/sys/contrib/dev/mediatek/mt76/mt7915/coredump.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2022 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7915_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c b/sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c index 0df2bd93c82e..9214286ca000 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c +++ b/sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2020 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7915_ +#endif + #include #include #include "mt7915.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/mcu.c b/sys/contrib/dev/mediatek/mt76/mt7915/mcu.c index f83f4eaa8a24..17c9c261960f 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7915/mcu.c +++ b/sys/contrib/dev/mediatek/mt76/mt7915/mcu.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2020 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7915_ +#endif + #include #include "mt7915.h" #include "mcu.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/mmio.c b/sys/contrib/dev/mediatek/mt76/mt7915/mmio.c index 83a828b7c578..ace2441d41a9 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7915/mmio.c +++ b/sys/contrib/dev/mediatek/mt76/mt7915/mmio.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2020 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7915_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/mt7921/mcu.c b/sys/contrib/dev/mediatek/mt76/mt7921/mcu.c index 4b95d7c0a225..57b9de7a6659 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7921/mcu.c +++ b/sys/contrib/dev/mediatek/mt76/mt7921/mcu.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2020 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7921_ +#endif + #include #include #include "mt7921.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7925/mcu.c b/sys/contrib/dev/mediatek/mt76/mt7925/mcu.c index d62d461db699..77e494a4ece0 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7925/mcu.c +++ b/sys/contrib/dev/mediatek/mt76/mt7925/mcu.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2023 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7925_ +#endif + #include #include #include "mt7925.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7925/pci.c b/sys/contrib/dev/mediatek/mt76/mt7925/pci.c index 3417fc5db6a9..e34f99abd16c 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7925/pci.c +++ b/sys/contrib/dev/mediatek/mt76/mt7925/pci.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2023 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7925_pci_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/mt7996/coredump.c b/sys/contrib/dev/mediatek/mt76/mt7996/coredump.c index 303d6e80a666..433846d2319e 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7996/coredump.c +++ b/sys/contrib/dev/mediatek/mt76/mt7996/coredump.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: ISC /* Copyright (C) 2023 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7996_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/mt7996/mcu.c b/sys/contrib/dev/mediatek/mt76/mt7996/mcu.c index 5099aa2004b7..443cd21a32b8 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7996/mcu.c +++ b/sys/contrib/dev/mediatek/mt76/mt7996/mcu.c @@ -3,6 +3,10 @@ * Copyright (C) 2022 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7996_ +#endif + #include #include #include "mt7996.h" diff --git a/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c b/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c index bb82f5807ff8..05a3d9019167 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c +++ b/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c @@ -3,6 +3,10 @@ * Copyright (C) 2022 MediaTek Inc. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt7996_ +#endif + #include #include #include diff --git a/sys/contrib/dev/mediatek/mt76/usb.c b/sys/contrib/dev/mediatek/mt76/usb.c index f9e67b8c3b3c..11f9d2808f15 100644 --- a/sys/contrib/dev/mediatek/mt76/usb.c +++ b/sys/contrib/dev/mediatek/mt76/usb.c @@ -3,6 +3,10 @@ * Copyright (C) 2018 Lorenzo Bianconi */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX mt76_usb_ +#endif + #include #include "mt76.h" #include "usb_trace.h" From nobody Wed Dec 3 20:02:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM7py1CzVz6Hjqt for ; Wed, 03 Dec 2025 20:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM7py0VwJz3CL3 for ; Wed, 03 Dec 2025 20:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764792170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gxtxi+5hIT7NZ14BWSgdi2wQ8iIW+llt+/eAg1QLJZU=; b=QtAAk01LJKIzpiGqR+0uHQvPPAPePudjQm3loqtivcTPzZdeH278eq7rLBUa8gn4BQpmTz 9VdvmW1HavU6oMLxU75pGmv11c5BDgW05nYsKWhYFw3MsgWWpRSziyEzfVahKtthBPJq7z icPHqJQ7FoOs3Q3ITEIGhgkghtcSPdxyZJKz2hh21s65aqc3HAcQp1/HJyfYCOgpA38ipr 17To+hNmpA9S51Tht9k4LK8sheMZl5NhBJm+nOElzEf8ol/LPgFMwZJ9o/1dnP86WGvhhT hLXq0Fl/ggKFx8xYtze76zORLwkaoatMMTQ4nKZYno9IwmMXu+GVaGxw1K8FRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764792170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gxtxi+5hIT7NZ14BWSgdi2wQ8iIW+llt+/eAg1QLJZU=; b=suC7hOyk8vestzkFn3LGR1of8OCeqYmcUex3fHGTPawsWjuWZqhGl2Eotux0npiaJdREwT v+ZyJy6eSD111cq2SxYya0YwCkNM1rFbI4GX8T/UabDPBn67RtE4E3XXJHgwlTww6F3ta2 CPMcb4sZhGG3JgkIS4OTiUL5gmdvxi7igYSY8Qite8EPTml+lVUFZjToWdalbXMNedssjj a3DS6PQDsSW+5oYp/po9np28tkPspy1Kod92fGYdfkUK4CDT6cPeethcYAuWQ002NnmfOL QCV+DQK7quaxXIbYtRrXUKMDFyIQt41iO9P3WdyMvhYOXJ2Euzgw+YT2VsumRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764792170; a=rsa-sha256; cv=none; b=uRvvUmnhzitaAkEbIz5Id5gR+SDD8kd8KQfxzaMyrBFdOvB3rg5TEh+Wn6FT3hbI2v26Bn xIwmc7H+rua7+OgY9Lq+Lx/8sGkX2HPh1gfF5Ln9BzT8KTCN+erSYe8/asOie0mlV3KquU cvTOIvVRoS/MWo/87clOcvKO8P2LVWT2kTn1AgiPwIEhmqqL9U5aajmOW0NxYY50EOed0E 997qVv5w0gkhLXqwiZF0gCGvMqqAnBXXwFAT/env3cBb8gl6+JzSthoVchs33t9NiqcpYA 0DUcKucCF5mAKMjOJqtBXsCybsrhMg2XHDDfEimY3cr+bFLIVRaDVOC41YPdgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM7py06przsNs for ; Wed, 03 Dec 2025 20:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2b039 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 20:02:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 3d71ce92eae9 - main - libc/stdc_has_single_bit.c: fix gcc warning (-Wparentheses) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d71ce92eae9f1417f35a0d07912858fd8f6fa0b Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 20:02:45 +0000 Message-Id: <69309765.2b039.1219894e@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3d71ce92eae9f1417f35a0d07912858fd8f6fa0b commit 3d71ce92eae9f1417f35a0d07912858fd8f6fa0b Author: Robert Clausecker AuthorDate: 2025-12-03 18:36:27 +0000 Commit: Robert Clausecker CommitDate: 2025-12-03 20:02:06 +0000 libc/stdc_has_single_bit.c: fix gcc warning (-Wparentheses) gcc14 is concerned that the operator precedence between - and & might be confusing. Throw in some redundant parentheses to make it shut up. The LLVM build was fine before this change. Reported by: Martin Filla Approved by: markj (mentor) MFC after: 1 month Fixes: 6296500a85c8474e3ff3fe2f8e4a9d56dd0acd64 Differential Revision: https://reviews.freebsd.org/D54057 --- lib/libc/stdbit/stdc_has_single_bit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libc/stdbit/stdc_has_single_bit.c b/lib/libc/stdbit/stdc_has_single_bit.c index e5f676265551..a448464b04d9 100644 --- a/lib/libc/stdbit/stdc_has_single_bit.c +++ b/lib/libc/stdbit/stdc_has_single_bit.c @@ -10,29 +10,29 @@ bool stdc_has_single_bit_uc(unsigned char x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } bool stdc_has_single_bit_us(unsigned short x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } bool stdc_has_single_bit_ui(unsigned int x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } bool stdc_has_single_bit_ul(unsigned long x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } bool stdc_has_single_bit_ull(unsigned long long x) { - return (x != 0 && (x & x - 1) == 0); + return (x != 0 && (x & (x - 1)) == 0); } From nobody Wed Dec 3 21:22:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dM9bH5GCMz6HqgL for ; Wed, 03 Dec 2025 21:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dM9bH4LZpz3Qph for ; Wed, 03 Dec 2025 21:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764796971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTfp8yodhUpdjeJgdkr7Jj5NryFbsbeR7FBMLCNZMZk=; b=Dul8V9fWt387ouFo77Va9QxEbqEXLlXMFd3tOLiShrAlZI+8TYvSQs93ZsMWONzzMWLRWZ zQHDyX/uTnaIhew8GTJarkxckID/8P9wFhGdfRnpFW1Qv/B4oMf5sd3fsF68m00zjZZGF6 bBUM10XG3jB+Quu6y0dCr0lr+G+UGobUwdAM9eCHREQnteV/AgjY/K4tHUvlkaNweLYkSY fV1gflHmwnKybIkxXGfzNKkEx0wjiXEKF96t+PyNqoj/hPcXD/dw78Xiw2NrqZjTVHCU9C S0UZK5ymIpLKbSyub2aDmcjaWZy3Jbl1AGKcQX1yI9cvW2OJIZp9HMd+Asq/zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764796971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTfp8yodhUpdjeJgdkr7Jj5NryFbsbeR7FBMLCNZMZk=; b=KNHy2Ct+MCgoDC487ubb28uUwCAmghyBD9Gea7qNAvqL3sBQri21VgnedpV5td4KFKx+vr bmpwsrXhDRaVSIucXIOrJv5h57tUczSIOlCmBKF3MOXYO9g7FMjF/851ugKsMBxBDefEKg vVzlz9G+yhW6HDVncF2/kj2cwt6asdYNzAJ361UQqazHBXZZptvIgHt2J3F0hxr33/B6Qx RrXjUhiPw/rwV1qzaiCBeBMd56PpGczQ1QwhMwfN9S0VYdWFy582OGq08GoigZJn8CCexp EcXAycXhZ4E/sori2nheN7kiOGlMeDX2JPiMoy/zi6XemQhIyDdUx0m/GN5rrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764796971; a=rsa-sha256; cv=none; b=NCc6arHLiPi7xLfkMfj7RUEDzoT3sxh5RTkYBy/yXVl5DZEnoh7ax0szYqsS3wa/I6CvU6 wjNSiJpyzirTtJbyCb27jC8SuqXyQEsVoTGJp6dKC70/ZKOzYhMj0/vm8QmFvEoRLBLHxR WjQaNZHnfUXFugMPJ9Tfa9N5pXOk6S+zvdnBaE4rI+qqAm2gLAt47qutt0+y7KIbNePbXy iNSz61+cnpaZdj5armq9H+si/v/mxkTRIpk4Mp8iEsKTnc5crMhLqQipHLKwxSFUQ2tvBo XYl/xvOGI6GDlY53C5AoOsSxTUpHmPpIviXFe1jeWBClCKA/jtxQWkSGfnf1xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dM9bH3fckzvZH for ; Wed, 03 Dec 2025 21:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32ad1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 21:22:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John-Mark Gurney Subject: git: 1ba6fd3de531 - main - ichsmb: shutdown interrupts to prevent spurious interrupts after kexec List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jmg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ba6fd3de531a3e731d33e9ad376ce3fa602e866 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 21:22:51 +0000 Message-Id: <6930aa2b.32ad1.2f34da64@gitrepo.freebsd.org> The branch main has been updated by jmg: URL: https://cgit.FreeBSD.org/src/commit/?id=1ba6fd3de531a3e731d33e9ad376ce3fa602e866 commit 1ba6fd3de531a3e731d33e9ad376ce3fa602e866 Author: John-Mark Gurney AuthorDate: 2025-12-03 21:19:10 +0000 Commit: John-Mark Gurney CommitDate: 2025-12-03 21:19:10 +0000 ichsmb: shutdown interrupts to prevent spurious interrupts after kexec Obtained from: Hewlett Packard Enterprise Rebiewed by: jhb, jhibbits --- sys/dev/ichsmb/ichsmb.c | 11 +++++++++++ sys/dev/ichsmb/ichsmb_pci.c | 1 + sys/dev/ichsmb/ichsmb_var.h | 1 + 3 files changed, 13 insertions(+) diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c index c5e9e2f1b9ed..e40a8a8a3886 100644 --- a/sys/dev/ichsmb/ichsmb.c +++ b/sys/dev/ichsmb/ichsmb.c @@ -703,4 +703,15 @@ ichsmb_detach(device_t dev) return 0; } +int +ichsmb_shutdown(device_t dev) +{ + const sc_p sc = device_get_softc(dev); + + /* Disable interrupts */ + bus_write_1(sc->io_res, ICH_HST_CNT, 0); + + return (0); +} + DRIVER_MODULE(smbus, ichsmb, smbus_driver, 0, 0); diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c index e4d87fe1fed2..9ffb1de62dac 100644 --- a/sys/dev/ichsmb/ichsmb_pci.c +++ b/sys/dev/ichsmb/ichsmb_pci.c @@ -243,6 +243,7 @@ static device_method_t ichsmb_pci_methods[] = { DEVMETHOD(device_probe, ichsmb_pci_probe), DEVMETHOD(device_attach, ichsmb_pci_attach), DEVMETHOD(device_detach, ichsmb_detach), + DEVMETHOD(device_shutdown, ichsmb_shutdown), /* SMBus methods */ DEVMETHOD(smbus_callback, ichsmb_callback), diff --git a/sys/dev/ichsmb/ichsmb_var.h b/sys/dev/ichsmb/ichsmb_var.h index 7fb14804d3c4..8aeaf403781b 100644 --- a/sys/dev/ichsmb/ichsmb_var.h +++ b/sys/dev/ichsmb/ichsmb_var.h @@ -84,6 +84,7 @@ extern void ichsmb_release_resources(sc_p sc); extern int ichsmb_probe(device_t dev); extern int ichsmb_attach(device_t dev); extern int ichsmb_detach(device_t dev); +extern int ichsmb_shutdown(device_t dev); #endif /* _DEV_ICHSMB_ICHSMB_VAR_H */ From nobody Wed Dec 3 23:19:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBQ5Lqyz6J1tT for ; Wed, 03 Dec 2025 23:19: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMDBQ3XnPz3Zmg for ; Wed, 03 Dec 2025 23:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764803998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WTHRvwksD6FgEjbfE4luLHshz3n2yw10h0n9v5bsJ+0=; b=JS5LYDBGYbkYIIQ4JmM2ULG/qn54l0aU0FOIoBaylMo+u6tvg8fyz+yjuY+wdhVZ87L+56 PAaoo22hklktYPS2RVEx/8Rt8bXgmyv0xyY/UYaE9Pan9wP4OJC5a1fVPUcV/biwPgipAW 1DDQe0VycEuucESTpqU8W+IQ/z9EycIJ1QZ8T7IVxeN5WU3D9tWdacM13kqlQxDCVX0mrk LH/mMDPT67XD4qt80eXI12tha4tsW5b1qAw6/kTMnlzSO3M0sBSXwBiY8jS0WTthH0NFG1 m3e4wpBBeQJ3cFLF8Z5pT116roTdK3IP/yNt4g0j+QFSg0ztsi18cgJFgDYmGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764803998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WTHRvwksD6FgEjbfE4luLHshz3n2yw10h0n9v5bsJ+0=; b=HkiKe04sWpI3cTS0RID6gNUEdgVFHSKa/dtcmcrpEoq6ZOJKXzlh7MCSe0nprZ3Fi9G98c M2nPySbj9ZhH7Vqs4t5G6SuyrqAUZGo8wfthVLoaptgWF0N9h2D6WyScnpzScqxuxrm7A9 VzuzJvuwt5kjpnhnJJEJ7qxsyje1jrNCV8nq9bCLFlB+FkTJ3eHzAgSBfsM8drFMzOGONE O3NHZdoBjJLNnWoaiAVbR1IZVyMEOlW2qe3ugDdtZISB1fyQ+Xhk1bO3SfM3uiNFCQHP7z bfSuRG9VHrFHrE3028bCd++qfpd8JbCb5aGVqUT+zzIOibmw/0G8Q0f2HFUt4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764803998; a=rsa-sha256; cv=none; b=kN6m+R4f+3cxNkXpd47ITRPyNodC/NNVxylup0eAAHGiXIIHp6qdRK2T9zULzSWSQYsb9F 1maPVLv5NNiRrwRYqM2T6zfwnAJA8BfktzzQQs1RX9f6MqdEBEmYFOQZo9kkEh057eFbQg 22J1v6XO63ofT43L+kVVyFxwF6492+F6hFaQ6DdHoNn25noVdyaoQZZVUfrLh1JYfeheJI zmR/cw0DrGx8fmC3ZEnrtXuYAlV6DQl1hLoPbMvVRHubqqEw1r0mkGaDWfaFnAnsc1Ie+w xj71pcY4jr0NQ3P/BuZIwT26DM+dzwjRTpHextQQ//F0xdkRKsqvKUiOCpFQ4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBQ2ZW9zy4D for ; Wed, 03 Dec 2025 23:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c9da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 23:19:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 73fe85e486d2 - main - tcp: store flowid info in syncache List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73fe85e486d297c9c976095854c1c84007e543f0 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 23:19:58 +0000 Message-Id: <6930c59e.3c9da.10a712cd@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=73fe85e486d297c9c976095854c1c84007e543f0 commit 73fe85e486d297c9c976095854c1c84007e543f0 Author: Gleb Smirnoff AuthorDate: 2025-12-03 23:15:34 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-03 23:19:44 +0000 tcp: store flowid info in syncache Now retransmissions by syncache would use correct flowid, same as synchronous responds. Reviewed by: tuexen, gallatin Differential Revision: https://reviews.freebsd.org/D51792 --- sys/netinet/tcp_input.c | 2 +- sys/netinet/tcp_syncache.c | 101 +++++++++++++++++++++++++++++---------------- sys/netinet/tcp_syncache.h | 8 ++-- 3 files changed, 70 insertions(+), 41 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 85ab26351f6b..9014dd690764 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1171,7 +1171,7 @@ tfo_socket_result: * causes. */ if (thflags & TH_RST) { - syncache_chkrst(&inc, th, m, port); + syncache_chkrst(&inc, th, port); goto dropunlock; } /* diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 056542bc43d6..eb473dac4dfc 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -35,6 +35,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_rss.h" #include #include @@ -120,8 +121,8 @@ SYSCTL_BOOL(_net_inet_tcp, OID_AUTO, syncookies_only, CTLFLAG_VNET | CTLFLAG_RW, static void syncache_drop(struct syncache *, struct syncache_head *); static void syncache_free(struct syncache *); static void syncache_insert(struct syncache *, struct syncache_head *); -static int syncache_respond(struct syncache *, const struct mbuf *, int); -static void syncache_send_challenge_ack(struct syncache *, struct mbuf *); +static int syncache_respond(struct syncache *, int); +static void syncache_send_challenge_ack(struct syncache *); static struct socket *syncache_socket(struct syncache *, struct socket *, struct mbuf *m); static void syncache_timeout(struct syncache *sc, struct syncache_head *sch, @@ -528,7 +529,7 @@ syncache_timer(void *xsch) } NET_EPOCH_ENTER(et); - if (syncache_respond(sc, NULL, TH_SYN|TH_ACK) == 0) { + if (syncache_respond(sc, TH_SYN|TH_ACK) == 0) { syncache_timeout(sc, sch, 0); TCPSTAT_INC(tcps_sndacks); TCPSTAT_INC(tcps_sndtotal); @@ -611,8 +612,7 @@ syncache_lookup(struct in_conninfo *inc, struct syncache_head **schp) * If required send a challenge ACK. */ void -syncache_chkrst(struct in_conninfo *inc, struct tcphdr *th, struct mbuf *m, - uint16_t port) +syncache_chkrst(struct in_conninfo *inc, struct tcphdr *th, uint16_t port) { struct syncache *sc; struct syncache_head *sch; @@ -698,7 +698,7 @@ syncache_chkrst(struct in_conninfo *inc, struct tcphdr *th, struct mbuf *m, "sending challenge ACK\n", s, __func__, th->th_seq, sc->sc_irs + 1, sc->sc_wnd); - syncache_send_challenge_ack(sc, m); + syncache_send_challenge_ack(sc); } } else { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) @@ -807,19 +807,6 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) #ifdef INET6 } #endif - - /* - * If there's an mbuf and it has a flowid, then let's initialise the - * inp with that particular flowid. - */ - if (m != NULL && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { - inp->inp_flowid = m->m_pkthdr.flowid; - inp->inp_flowtype = M_HASHTYPE_GET(m); -#ifdef NUMA - inp->inp_numa_domain = m->m_pkthdr.numa_domain; -#endif - } - inp->inp_lport = sc->sc_inc.inc_lport; #ifdef INET6 if (inp->inp_vflag & INP_IPV6PROTO) { @@ -890,6 +877,38 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) if (ipsec_copy_pcbpolicy(sotoinpcb(lso), inp) != 0) printf("syncache_socket: could not copy policy\n"); #endif + if (sc->sc_flowtype != M_HASHTYPE_NONE) { + inp->inp_flowid = sc->sc_flowid; + inp->inp_flowtype = sc->sc_flowtype; +#ifdef RSS + } else { + /* assign flowid by software RSS hash */ +#ifdef INET6 + if (sc->sc_inc.inc_flags & INC_ISIPV6) { + rss_proto_software_hash_v6(&inp->in6p_faddr, + &inp->in6p_laddr, + inp->inp_fport, + inp->inp_lport, + IPPROTO_TCP, + &inp->inp_flowid, + &inp->inp_flowtype); + } else +#endif /* INET6 */ + { + rss_proto_software_hash_v4(inp->inp_faddr, + inp->inp_laddr, + inp->inp_fport, + inp->inp_lport, + IPPROTO_TCP, + &inp->inp_flowid, + &inp->inp_flowtype); + } +#endif /* RSS */ + } +#ifdef NUMA + inp->inp_numa_domain = sc->sc_numa_domain; +#endif + tp->t_state = TCPS_SYN_RECEIVED; tp->iss = sc->sc_iss; tp->irs = sc->sc_irs; @@ -1144,6 +1163,13 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, return (-1); /* Do not send RST */ } #endif /* TCP_SIGNATURE */ + if (m != NULL && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { + sc->sc_flowid = m->m_pkthdr.flowid; + sc->sc_flowtype = M_HASHTYPE_GET(m); + } +#ifdef NUMA + sc->sc_numa_domain = m ? m->m_pkthdr.numa_domain : M_NODOM; +#endif TCPSTATES_INC(TCPS_SYN_RECEIVED); } else { if (sc->sc_port != port) { @@ -1262,7 +1288,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, " "sending challenge ACK\n", s, __func__, th->th_seq, sc->sc_irs + 1); - syncache_send_challenge_ack(sc, m); + syncache_send_challenge_ack(sc); SCH_UNLOCK(sch); free(s, M_TCPLOG); return (-1); /* Do not send RST */ @@ -1559,7 +1585,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, s, __func__); free(s, M_TCPLOG); } - if (syncache_respond(sc, m, TH_SYN|TH_ACK) == 0) { + if (syncache_respond(sc, TH_SYN|TH_ACK) == 0) { sc->sc_rxmits = 0; syncache_timeout(sc, sch, 1); TCPSTAT_INC(tcps_sndacks); @@ -1734,6 +1760,13 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, sc->sc_flowlabel = ip6_randomflowlabel(); sc->sc_flowlabel = htonl(sc->sc_flowlabel) & IPV6_FLOWLABEL_MASK; } +#endif + if (m != NULL && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { + sc->sc_flowid = m->m_pkthdr.flowid; + sc->sc_flowtype = M_HASHTYPE_GET(m); + } +#ifdef NUMA + sc->sc_numa_domain = m ? m->m_pkthdr.numa_domain : M_NODOM; #endif if (locked) SCH_UNLOCK(sch); @@ -1748,7 +1781,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, /* * Do a standard 3-way handshake. */ - if (syncache_respond(sc, m, TH_SYN|TH_ACK) == 0) { + if (syncache_respond(sc, TH_SYN|TH_ACK) == 0) { if (sc != &scs) syncache_insert(sc, sch); /* locks and unlocks sch */ TCPSTAT_INC(tcps_sndacks); @@ -1791,11 +1824,11 @@ tfo_expanded: } /* - * Send SYN|ACK or ACK to the peer. Either in response to a peer's segment, - * i.e. m0 != NULL, or upon 3WHS ACK timeout, i.e. m0 == NULL. + * Send SYN|ACK or ACK to the peer. Either in response to a peer's segment + * or upon 3WHS ACK timeout. */ static int -syncache_respond(struct syncache *sc, const struct mbuf *m0, int flags) +syncache_respond(struct syncache *sc, int flags) { struct ip *ip = NULL; struct mbuf *m; @@ -1985,15 +2018,11 @@ syncache_respond(struct syncache *sc, const struct mbuf *m0, int flags) udp->uh_ulen = htons(ulen); } M_SETFIB(m, sc->sc_inc.inc_fibnum); - /* - * If we have peer's SYN and it has a flowid, then let's assign it to - * our SYN|ACK. ip6_output() and ip_output() will not assign flowid - * to SYN|ACK due to lack of inp here. - */ - if (m0 != NULL && M_HASHTYPE_GET(m0) != M_HASHTYPE_NONE) { - m->m_pkthdr.flowid = m0->m_pkthdr.flowid; - M_HASHTYPE_SET(m, M_HASHTYPE_GET(m0)); - } + m->m_pkthdr.flowid = sc->sc_flowid; + M_HASHTYPE_SET(m, sc->sc_flowtype); +#ifdef NUMA + m->m_pkthdr.numa_domain = sc->sc_numa_domain; +#endif #ifdef INET6 if (sc->sc_inc.inc_flags & INC_ISIPV6) { if (sc->sc_port) { @@ -2056,11 +2085,11 @@ syncache_respond(struct syncache *sc, const struct mbuf *m0, int flags) } static void -syncache_send_challenge_ack(struct syncache *sc, struct mbuf *m) +syncache_send_challenge_ack(struct syncache *sc) { if (tcp_challenge_ack_check(&sc->sc_challenge_ack_end, &sc->sc_challenge_ack_cnt)) { - if (syncache_respond(sc, m, TH_ACK) == 0) { + if (syncache_respond(sc, TH_ACK) == 0) { TCPSTAT_INC(tcps_sndacks); TCPSTAT_INC(tcps_sndtotal); } diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h index c916b4de6ae0..ce5ad666b115 100644 --- a/sys/netinet/tcp_syncache.h +++ b/sys/netinet/tcp_syncache.h @@ -43,8 +43,7 @@ int syncache_expand(struct in_conninfo *, struct tcpopt *, struct socket * syncache_add(struct in_conninfo *, struct tcpopt *, struct tcphdr *, struct inpcb *, struct socket *, struct mbuf *, void *, void *, uint8_t, uint16_t); -void syncache_chkrst(struct in_conninfo *, struct tcphdr *, struct mbuf *, - uint16_t); +void syncache_chkrst(struct in_conninfo *, struct tcphdr *, uint16_t); int syncache_pcblist(struct sysctl_req *); struct syncache { @@ -65,6 +64,7 @@ struct syncache { u_int8_t sc_ip_tos; /* TOS / Traffic Class */ u_int8_t sc_requested_s_scale:4, sc_requested_r_scale:4; + uint8_t sc_numa_domain; u_int16_t sc_flags; u_int32_t sc_challenge_ack_cnt; /* chall. ACKs sent in epoch */ sbintime_t sc_challenge_ack_end; /* End of chall. ack epoch */ @@ -75,8 +75,8 @@ struct syncache { struct label *sc_label; /* MAC label reference */ struct ucred *sc_cred; /* cred cache for jail checks */ void *sc_tfo_cookie; /* for TCP Fast Open response */ - void *sc_pspare; /* TCP_SIGNATURE */ - u_int32_t sc_spare[2]; /* UTO */ + uint32_t sc_flowtype; /* flowid from SYN packet .. */ + uint32_t sc_flowid; /* .. or calculated by RSS */ }; /* From nobody Wed Dec 3 23:19:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBR5wTTz6J1p7 for ; Wed, 03 Dec 2025 23:19: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMDBR3Mp3z3ZrC for ; Wed, 03 Dec 2025 23:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764803999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TDjGhlevJ/4jqEgFpUreIFB4l/ar4PqOar42DcX1r0=; b=JgfzjUfo9kMycuKJsvFNIbx3hZvVpWdpwCD/cjkeMuGtME0CeWkBCfAV/JGgKhQfeCCTBI GGhVTgCkkV+npHCHMF8Afkxq6CBzFRYFyMBvQ1/jt0wsI8Q/rH1wJTzuwvQ+waza7J1hNt 1Al5nXUW3WLFb4hbozKSKk2SqdwX2FFd73iLtA26hLfayB2lhPAwfRcVOL1qEnBmyWXKSK bvTNAoPtIomjC8yB6PUXIjhNKbqDX7mmQVViYG6r0odWoLMu5teQlx9NXK3Ldw9gIxIkD9 rPuqsHGhlLYmZT9rycUO0waXtK71IXiPx7FgTuaZx4qWAs8BXKNmp4PBiglmog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764803999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TDjGhlevJ/4jqEgFpUreIFB4l/ar4PqOar42DcX1r0=; b=fExhp6QPoc9rh+65qajOoHyVfImag7rcCgXcD0sST9vFCWSxiWWEY6Ke+rvn4v5NqlY8PJ BQJtKBdf+N9NBzIdUFOoE8YMJ/Uf8CET5cqUKqLN9ZSBt3VojhcIajYGKXtzvf5CW7TW77 cfd0uvg6LFvM05tVjKGBBgaZ2y9KvxpQXWpBO93O6P0JN5BXOmVKYjczYIiYf6ye63R3vt DVUOsbUgd0dEpGL7femZjWHQ4aWuRq6PZco1qQw/PfVRDlI8co2Dj9/sLzjKtQZ5BAspIv SXKm8fdYCK61Jlc1AKUEgI+1R5nuHwTGI5zz3frCDyQdOhVYn+0IOFgUdxuvVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764803999; a=rsa-sha256; cv=none; b=dbfP3rsMBFRFAGw960SxDCB/8oZXwL/eegPaVgtSMINq5rnNU6Bg0Ify7lv8SK1oqinurk gKVln5yaX7/AgL++4J4bI9Gsj/kON2cLLPSaZCRWtQ84Ce7XueT0GQzTQ0xlZumIihlk4R DtVmrMsHOnjXbGExFIhBHvpKws1xp3GAVaAzmNf9Pqq3VQtaxpWGpFSH/97NgoNbcaw6NK SlI8wmQcnAjubomFazMyhnTqg+g1POhLiMNbEQIvRncRYytld9NzQ+FhOLTJkAXM1INhZV xRMbUnhfbo9pUmxiMbD9HewaGn2MDHW67Qbytqox2Cu16qEmaDJra9FuJ00koA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBR2v5yzxd5 for ; Wed, 03 Dec 2025 23:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e606 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 23:19:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ee18f8be2165 - main - tcp: don't set flowid in tcp_input() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee18f8be21655c2d98c1c1bd4e081c366fa91c9a Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 23:19:59 +0000 Message-Id: <6930c59f.3e606.697bc870@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ee18f8be21655c2d98c1c1bd4e081c366fa91c9a commit ee18f8be21655c2d98c1c1bd4e081c366fa91c9a Author: Gleb Smirnoff AuthorDate: 2025-12-03 23:15:45 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-03 23:19:44 +0000 tcp: don't set flowid in tcp_input() With dd0e6bb996dc setting it always on connect(2) and syncache always picking up the flowid from the incoming packet, any ESTABLISHED connection shall have the flowid already set. Reviewed by: tuexen, gallatin Differential Revision: https://reviews.freebsd.org/D53886 --- sys/netinet/tcp_input.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 9014dd690764..0036a07384ae 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -923,37 +923,6 @@ findpcb: } INP_LOCK_ASSERT(inp); - if ((inp->inp_flowtype == M_HASHTYPE_NONE) && - !SOLISTENING(inp->inp_socket)) { - if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { - inp->inp_flowid = m->m_pkthdr.flowid; - inp->inp_flowtype = M_HASHTYPE_GET(m); -#ifdef RSS - } else { - /* assign flowid by software RSS hash */ -#ifdef INET6 - if (isipv6) { - rss_proto_software_hash_v6(&inp->in6p_faddr, - &inp->in6p_laddr, - inp->inp_fport, - inp->inp_lport, - IPPROTO_TCP, - &inp->inp_flowid, - &inp->inp_flowtype); - } else -#endif /* INET6 */ - { - rss_proto_software_hash_v4(inp->inp_faddr, - inp->inp_laddr, - inp->inp_fport, - inp->inp_lport, - IPPROTO_TCP, - &inp->inp_flowid, - &inp->inp_flowtype); - } -#endif /* RSS */ - } - } #if defined(IPSEC) || defined(IPSEC_SUPPORT) #ifdef INET6 if (isipv6 && IPSEC_ENABLED(ipv6) && From nobody Wed Dec 3 23:20:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBS6ndqz6J1rC for ; Wed, 03 Dec 2025 23:20: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMDBS3z3Cz3Zmn for ; Wed, 03 Dec 2025 23:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNZEIDK9EKFu1KKil9RImkDPmO4O/CRznrLkkWvKq4c=; b=MvIZDlY6p/CMY/iueNkO9kb3ATRZ3JPq4vpND2iO6vnqnbyzP6QvYhI2jwz1VcqRChctVH HA3O1BrFpH5Sfd3jiuDp5uwWYurCfBV1bQn2KGE5wqOd55AEth4WdU7ilC3H3tjdcBdB5S pb8M6uPRLHfFEZqvoy84h0iq/HE7LiRg15E58MUDPpAW5/PmVOogoo2FpESxCM0L2elMRc 2fbtH34iplFS51vGkoo/+zREJhpel9D5YF3r9zIW9iLu32tBBR7yGOB+qeym5OBftibN0E vtRTEpw4LkgWTa+AtQte4frgOj5kF+mn+aK/ErKuJXr3IltJP6kjxgS1u4QWPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNZEIDK9EKFu1KKil9RImkDPmO4O/CRznrLkkWvKq4c=; b=qgfTDK8qTVIJcwa0R4qI82ww/47CWzRxaQZv9+3Dnsu8cfha+xP7k2Ot74zNzoIE4AroDh cZiGJ3S/ljoEKXtz4ykh4HU99DB/Dl8wSk9a0gp4tB0EsNHs+9tHjKLWMJMb3jzpJ9u54h EiPAPQhW1ue7QblmKnyTJfI3azEbSi6CKL3xDaScqzRmTj9PrwT62kuVwiNsRBpAuY/sYe Amc3C4/fR3TzXaKUcGJv1ThhLqkkZl/kcpBSaJMqiqsOtNlY7hHw0riey53sHhDv7EzS8G Zl38teAMRdx5r4qBdOHHnQOxnQ3k99p7t4HQgbNrkqTOUoYXqx96VJYeXW1Ayw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764804000; a=rsa-sha256; cv=none; b=fWCcsKCWubrVePAxbPIfaMQXvoyH7Q5eh0VyyySdzJWdqh7KZLXNUK2zkoQ0SMuQoijmE+ 5vfeSIbD0eNRMzBsPy5FJSrYdeJbloDBl0Phc/Vg/MN8CKU06a62vs1I7UzQbe/mgnDcOP jN4DfWdsGTlUc+pWjk06CEQhEjcCh+bCAyNT8OtT1QnmSQoo8Yv9X3DvYMXgZ8hBLi+jdx ANlHH61kSiFbnRocCVvQbtZEy/oU2+ZCU0YNbsYcIcqkC6rK7f9OOMdwrihCoIID5rUKSw 5i5o8zyYP/ZCu6LJtY3IsVo0HGgXSEAEc4QCkrluImiPK9dJXPkVj2yWycvlcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBS39VWzxd6 for ; Wed, 03 Dec 2025 23:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dbcb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 23:20:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 57673d166940 - main - bpf: retire struct bpf_if_ext List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57673d166940feafe09f411294b57fa6c8af3585 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 23:20:00 +0000 Message-Id: <6930c5a0.3dbcb.36f5bf5b@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=57673d166940feafe09f411294b57fa6c8af3585 commit 57673d166940feafe09f411294b57fa6c8af3585 Author: Gleb Smirnoff AuthorDate: 2025-12-03 23:16:15 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-03 23:19:44 +0000 bpf: retire struct bpf_if_ext The struct was used for bpf_if to bif_dlist masking, that is used to optimize bpf_peers_present() call. The only functional change here is that bif_dlist and bif_next swap their places in the structure. Both belong to the first cache line anyway. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53867 --- sys/net/bpf.c | 13 ++++++------- sys/net/bpf.h | 13 ++++--------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 23a23fbfe22e..f5302059d5eb 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -93,14 +93,11 @@ MALLOC_DEFINE(M_BPF, "BPF", "BPF data"); -static const struct bpf_if_ext dead_bpf_if = { - .bif_dlist = CK_LIST_HEAD_INITIALIZER() -}; +static const struct bpfd_list dead_bpf_if = CK_LIST_HEAD_INITIALIZER(); struct bpf_if { -#define bif_next bif_ext.bif_next -#define bif_dlist bif_ext.bif_dlist - struct bpf_if_ext bif_ext; /* public members */ + struct bpfd_list bif_dlist; /* list of all interfaces */ + CK_LIST_ENTRY(bpf_if) bif_next; /* descriptor list */ u_int bif_dlt; /* link layer type */ u_int bif_hdrlen; /* length of link header */ struct bpfd_list bif_wlist; /* writer-only list */ @@ -110,7 +107,9 @@ struct bpf_if { struct epoch_context epoch_ctx; }; -CTASSERT(offsetof(struct bpf_if, bif_ext) == 0); +/* See bpf_peers_present() in bpf.h. */ +_Static_assert(offsetof(struct bpf_if, bif_dlist) == 0, + "bpf_if shall start with bif_dlist"); struct bpf_program_buffer { struct epoch_context epoch_ctx; diff --git a/sys/net/bpf.h b/sys/net/bpf.h index dfb8373bb329..b18840bfd2bf 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -410,11 +410,6 @@ SYSCTL_DECL(_net_bpf); struct bpf_if; CK_LIST_HEAD(bpfd_list, bpf_d); -struct bpf_if_ext { - CK_LIST_ENTRY(bpf_if) bif_next; /* list of all interfaces */ - struct bpfd_list bif_dlist; /* descriptor list */ -}; - void bpf_bufheld(struct bpf_d *d); int bpf_validate(const struct bpf_insn *, int); void bpf_tap(struct bpf_if *, u_char *, u_int); @@ -435,12 +430,12 @@ void bpfilterattach(int); u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int); static __inline bool -bpf_peers_present(struct bpf_if *bpf) +bpf_peers_present(const struct bpf_if *bpf) { - struct bpf_if_ext *ext; + const struct bpfd_list *dlist; - ext = (struct bpf_if_ext *)bpf; - return (!CK_LIST_EMPTY(&ext->bif_dlist)); + dlist = (const struct bpfd_list *)bpf; + return (!CK_LIST_EMPTY(dlist)); } #define BPF_TAP(_ifp, _pkt, _pktlen) \ From nobody Wed Dec 3 23:20:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBT5k8Mz6J1rF for ; Wed, 03 Dec 2025 23:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMDBT47hBz3bFB for ; Wed, 03 Dec 2025 23:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=10yA3lewqrGwlAfWywfmq8U8iZGaEMlH+J+dWmd2Gq4=; b=sN1hUcVhvYvKzNh+xBKOCILXEHD06TkHT1hQU2jrloHfmmxZSWbuPhEvc1WBjJSkrc2jk3 lO7pJsipb1BLwFGB44TvmfXgMHVAHXuYQtDY9J2cNCsTypTRI4pTKyEuY4NHoG4NNQqtec j+kY4anhC6mVyi97vTDrgOzJYU4MRL6Krwuouwtha58kM4iDngL1XmVRTnAmWWXYTgOFNR sBlbmkLZ+TvIPuZ7k0xqzPqEznxZrbVsfbfGeuXRtZ0tD4hWd51GOtPkkVxbO4UosSW+mq KJcvb2Inx7BBZd+Asq/vNjBdiCq5FrOGjYt9fA31aoY7NP1ZzaTShNradS+RYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=10yA3lewqrGwlAfWywfmq8U8iZGaEMlH+J+dWmd2Gq4=; b=FsSWJRwXHxljfH4LNcgMtqxycHJWZw+CBf6venuwaLFd5dnKySWwmgyNzf/DKrncOSXYv5 +mLIZtRm/SrNXJj9pQQG4xZ8N1piAuCIj3RUf8KUMDAoE3yD7N6Qyxd6Hoa1tVSYYVHcpI FaecKCKkJUe3eARRgnMMtaqEQrHBVC6+kUO5aALEDlfMSxVAX1jX+VGEf6wEFzEz+fddrZ lTwwyMH1cceC8tS/ubO/d/SzITQy+WGHsQE9UDCpoBsQNPaIjZCC1wqgNBvyFhuKH6BIEu F/qrOoT8PfrvN4ro37RjVwWIh88rB36VtXWRoCkaZH8Meyp4ObFPe2nkVck5oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764804001; a=rsa-sha256; cv=none; b=ZiwWGCzp4M4KKALiHJr+GdpJ0NTOlMvHakEaVLvhrgS9yKhLcFzviVKMksUpFjhTtGSVZw VPTqxWRDX1fy71BJWI1+5sFdQhofDjjJJCryaAOPUxMhs04Cq0W1WyBezjW/stTm89z+fk lXL8UHiH3840tMrTUydnVhIg66qsZH44lJ9y2w1vVI03hOPM3n6uUUbuJbpOmUEV29/8ps CLvw4eCuHiGn7WkJszz/ESfEI89EHevXh5Qq3mME51tiWepyJHWNpFI+10CdV+sn5qBvuP FLjvfYlNwwCUJAQNY8zAU1JJpN8JBAXXurtdfx2UOW/n+Ou7ikrPfhFfqPdcIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBT3WGnzy4H for ; Wed, 03 Dec 2025 23:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d56a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 23:20:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 845896655815 - main - bpf: calculate net.bpf.stats buffer size dynamically List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 845896655815eaf339953e2aa48d79ca4539874b Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 23:20:01 +0000 Message-Id: <6930c5a1.3d56a.1c37f13b@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=845896655815eaf339953e2aa48d79ca4539874b commit 845896655815eaf339953e2aa48d79ca4539874b Author: Gleb Smirnoff AuthorDate: 2025-12-03 23:16:33 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-03 23:19:45 +0000 bpf: calculate net.bpf.stats buffer size dynamically This removed the global counter, that was updated in a racy manner. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53868 --- sys/net/bpf.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index f5302059d5eb..aff0d3c761ad 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -178,7 +178,6 @@ struct bpf_dltlist32 { CK_LIST_HEAD(bpf_iflist, bpf_if); static struct bpf_iflist bpf_iflist = CK_LIST_HEAD_INITIALIZER(); static struct sx bpf_sx; /* bpf global lock */ -static int bpf_bpfd_cnt; static void bpfif_ref(struct bpf_if *); static void bpfif_rele(struct bpf_if *); @@ -760,7 +759,6 @@ bpf_attachd(struct bpf_d *d, struct bpf_if *bp) bpf_wakeup(d); BPFD_UNLOCK(d); - bpf_bpfd_cnt++; CTR3(KTR_NET, "%s: bpf_attach called by pid %d, adding to %s list", __func__, d->bd_pid, d->bd_writer ? "writer" : "active"); @@ -864,7 +862,6 @@ bpf_detachd(struct bpf_d *d, bool detached_ifp) bpf_wakeup(d); } BPFD_UNLOCK(d); - bpf_bpfd_cnt--; /* Call event handler iff d is attached */ if (error == 0) @@ -3044,7 +3041,8 @@ bpf_stats_sysctl(SYSCTL_HANDLER_ARGS) { static const struct xbpf_d zerostats; struct xbpf_d *xbdbuf, *xbd, tempstats; - int index, error; + u_int bpfd_cnt, index; + int error; struct bpf_if *bp; struct bpf_d *bd; @@ -3074,25 +3072,33 @@ bpf_stats_sysctl(SYSCTL_HANDLER_ARGS) bpf_zero_counters(); return (0); } - if (req->oldptr == NULL) - return (SYSCTL_OUT(req, 0, bpf_bpfd_cnt * sizeof(*xbd))); - if (bpf_bpfd_cnt == 0) - return (SYSCTL_OUT(req, 0, 0)); - xbdbuf = malloc(req->oldlen, M_BPF, M_WAITOK); + bpfd_cnt = 0; BPF_LOCK(); - if (req->oldlen < (bpf_bpfd_cnt * sizeof(*xbd))) { + CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + CK_LIST_FOREACH(bd, &bp->bif_wlist, bd_next) + bpfd_cnt++; + CK_LIST_FOREACH(bd, &bp->bif_dlist, bd_next) + bpfd_cnt++; + } + if (bpfd_cnt == 0 || req->oldptr == NULL) { + BPF_UNLOCK(); + return (SYSCTL_OUT(req, 0, bpfd_cnt * sizeof(*xbd))); + } + if (req->oldlen < bpfd_cnt * sizeof(*xbd)) { BPF_UNLOCK(); - free(xbdbuf, M_BPF); return (ENOMEM); } + xbdbuf = malloc(bpfd_cnt * sizeof(*xbd), M_BPF, M_WAITOK); index = 0; CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { /* Send writers-only first */ CK_LIST_FOREACH(bd, &bp->bif_wlist, bd_next) { + MPASS(index <= bpfd_cnt); xbd = &xbdbuf[index++]; bpfstats_fill_xbpf(xbd, bd); } CK_LIST_FOREACH(bd, &bp->bif_dlist, bd_next) { + MPASS(index <= bpfd_cnt); xbd = &xbdbuf[index++]; bpfstats_fill_xbpf(xbd, bd); } From nobody Wed Dec 3 23:20:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBV6WQ0z6J1tj for ; Wed, 03 Dec 2025 23:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMDBV4RZYz3bFP for ; Wed, 03 Dec 2025 23:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OB838eFQbeHHdGUnwnEbrADQojy4nkcq/tD14DnkrWM=; b=vIwKEfcxw2cF9CdSgnYaKsKc0HvCpovY3TUomomXRQ1An+6MyuCNiKOCDYU4+7vB0BPmrN 9V6ny+kPUZp9MxE/Hm6yw6TyLQRyXn8kgsPWj6iWeEDhVlvK5oNw0OqeEy9gIKWF3zdOGU zwUl/8aNt4B4c5Z8de95hnwy4gBWeq7bAUF6G7j9LtKqjBh+xoyD5YLu5W8RS4YCabmXbJ /ZfeBboOmKhI9r1d1Ld8XOD6XwinHQ6Dzkh3ypc8Su0evd69Fv6Bp39whuSkd1aHHi1YHm 1tm75CTXexMNIoMOif5ijlXKJOj0st0x3x/WFwkfzJEvsdd7TGjHRcHFucUtvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OB838eFQbeHHdGUnwnEbrADQojy4nkcq/tD14DnkrWM=; b=KyCEpFIgmbvB+C5Nwu/lzCMKKkFGVQ/CT254vWm80brsDD5cJqYPM8YSAqD/+zBulYBoJl VSdQnKZcLJBvqB5B6HKprn8fAPHIVM4j0WT/1Cvv0jaI9/hYONhZf4hRclNWdPRq5UI5Ue 065PpKRbcs3xe6/dhazI+8hNoLGC10I97VdnRbw2bJRLBuMYBg4zTnPtTNH8EZDeODkkV5 +z9VKmTxjhlIt8+Om4iVGxrgF3SMxdvYzF2XdebaASCiDXOWv4qj0L9h8xKYp7t2xPN3ba 8jwA3kd1UKmKvW0ythGSJU/niGBp2WKWSpdQbYwzlGRptybIbHfsXPGM0KakYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764804002; a=rsa-sha256; cv=none; b=ghSMGsZ4h9/Nkf/WgVHRXwhaSSxvJvgG/IPiPMkjhO2Fw0+bqzdDqsXpVlpoOIcQVH6jrg XltxdrEQRQbm/j5KyHRD05ZZSJtROg223UVO0R9P5U1+9p+hetN+y1a08Idl0Xq0yvjxrK snTJ5fC0pXHuksi3Wz7RN299nUISY8SH/PEtr3FikyPh/Ljh6RNKASDieSx48f0whe0fzG fgwtu3vas5HlSsAJcZNgWcUSzcHa41x8IbuCYTuiKcyAt7m9yXTegDDVYcjPpceWGB1A7/ +HJju5JZobc/Ris9EuDCcWllUxQY3uTzpOs5fALRHDg8GsvBJRP35FH3XgGL7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMDBV3qqFzy4J for ; Wed, 03 Dec 2025 23:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e633 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 23:20:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 72ca89482afc - main - bpf: global bpf list doesn't need CK List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72ca89482afcdec7db1d7555bdb3505498c729c2 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 23:20:02 +0000 Message-Id: <6930c5a2.3e633.361b4798@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=72ca89482afcdec7db1d7555bdb3505498c729c2 commit 72ca89482afcdec7db1d7555bdb3505498c729c2 Author: Gleb Smirnoff AuthorDate: 2025-12-03 23:16:50 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-03 23:19:45 +0000 bpf: global bpf list doesn't need CK All accesses to this list are done with the global lock held. The CK connotation is just confusing the reader. Fixes: 699281b545a8a3fc5109b5f2db62d261b65b588b Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53869 --- sys/net/bpf.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index aff0d3c761ad..b043773bc876 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -97,7 +97,7 @@ static const struct bpfd_list dead_bpf_if = CK_LIST_HEAD_INITIALIZER(); struct bpf_if { struct bpfd_list bif_dlist; /* list of all interfaces */ - CK_LIST_ENTRY(bpf_if) bif_next; /* descriptor list */ + LIST_ENTRY(bpf_if) bif_next; /* descriptor list */ u_int bif_dlt; /* link layer type */ u_int bif_hdrlen; /* length of link header */ struct bpfd_list bif_wlist; /* writer-only list */ @@ -175,8 +175,8 @@ struct bpf_dltlist32 { * structures registered by different layers in the stack (i.e., 802.11 * frames, ethernet frames, etc). */ -CK_LIST_HEAD(bpf_iflist, bpf_if); -static struct bpf_iflist bpf_iflist = CK_LIST_HEAD_INITIALIZER(); +LIST_HEAD(bpf_iflist, bpf_if); +static struct bpf_iflist bpf_iflist = LIST_HEAD_INITIALIZER(); static struct sx bpf_sx; /* bpf global lock */ static void bpfif_ref(struct bpf_if *); @@ -2078,7 +2078,7 @@ bpf_setif(struct bpf_d *d, struct ifreq *ifr) /* * Look through attached interfaces for the named one. */ - CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + LIST_FOREACH(bp, &bpf_iflist, bif_next) { if (bp->bif_ifp == theywant && bp->bif_bpf == &theywant->if_bpf) break; @@ -2799,7 +2799,7 @@ bpfattach2(struct ifnet *ifp, u_int dlt, u_int hdrlen, */ if_ref(ifp); BPF_LOCK(); - CK_LIST_INSERT_HEAD(&bpf_iflist, bp, bif_next); + LIST_INSERT_HEAD(&bpf_iflist, bp, bif_next); BPF_UNLOCK(); if (bootverbose && IS_DEFAULT_VNET(curvnet)) @@ -2817,7 +2817,7 @@ bpf_ifdetach(struct ifnet *ifp) struct bpf_d *d; BPF_LOCK(); - CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + LIST_FOREACH(bp, &bpf_iflist, bif_next) { if (bp->bif_ifp != ifp) continue; @@ -2848,11 +2848,11 @@ bpfdetach(struct ifnet *ifp) BPF_LOCK(); /* Find all bpf_if struct's which reference ifp and detach them. */ - CK_LIST_FOREACH_SAFE(bp, &bpf_iflist, bif_next, bp_temp) { + LIST_FOREACH_SAFE(bp, &bpf_iflist, bif_next, bp_temp) { if (ifp != bp->bif_ifp) continue; - CK_LIST_REMOVE(bp, bif_next); + LIST_REMOVE(bp, bif_next); *bp->bif_bpf = __DECONST(struct bpf_if *, &dead_bpf_if); CTR4(KTR_NET, @@ -2894,7 +2894,7 @@ bpf_getdltlist(struct bpf_d *d, struct bpf_dltlist *bfl) ifp = d->bd_bif->bif_ifp; n1 = 0; - CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + LIST_FOREACH(bp, &bpf_iflist, bif_next) { if (bp->bif_ifp == ifp) n1++; } @@ -2907,7 +2907,7 @@ bpf_getdltlist(struct bpf_d *d, struct bpf_dltlist *bfl) lst = malloc(n1 * sizeof(u_int), M_TEMP, M_WAITOK); n = 0; - CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + LIST_FOREACH(bp, &bpf_iflist, bif_next) { if (bp->bif_ifp != ifp) continue; lst[n++] = bp->bif_dlt; @@ -2939,7 +2939,7 @@ bpf_setdlt(struct bpf_d *d, u_int dlt) return (0); ifp = d->bd_bif->bif_ifp; - CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + LIST_FOREACH(bp, &bpf_iflist, bif_next) { if (bp->bif_ifp == ifp && bp->bif_dlt == dlt) break; } @@ -2986,7 +2986,7 @@ bpf_zero_counters(void) * We are protected by global lock here, interfaces and * descriptors can not be deleted while we hold it. */ - CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + LIST_FOREACH(bp, &bpf_iflist, bif_next) { CK_LIST_FOREACH(bd, &bp->bif_dlist, bd_next) { counter_u64_zero(bd->bd_rcount); counter_u64_zero(bd->bd_dcount); @@ -3074,7 +3074,7 @@ bpf_stats_sysctl(SYSCTL_HANDLER_ARGS) } bpfd_cnt = 0; BPF_LOCK(); - CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + LIST_FOREACH(bp, &bpf_iflist, bif_next) { CK_LIST_FOREACH(bd, &bp->bif_wlist, bd_next) bpfd_cnt++; CK_LIST_FOREACH(bd, &bp->bif_dlist, bd_next) @@ -3090,7 +3090,7 @@ bpf_stats_sysctl(SYSCTL_HANDLER_ARGS) } xbdbuf = malloc(bpfd_cnt * sizeof(*xbd), M_BPF, M_WAITOK); index = 0; - CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + LIST_FOREACH(bp, &bpf_iflist, bif_next) { /* Send writers-only first */ CK_LIST_FOREACH(bd, &bp->bif_wlist, bd_next) { MPASS(index <= bpfd_cnt); From nobody Thu Dec 4 03:33:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMKpN3Spxz6JPr8 for ; Thu, 04 Dec 2025 03:33: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMKpN0s6wz411Q for ; Thu, 04 Dec 2025 03:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764819180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AZ54/Hq32rSx6egxB/a+eHZukPPvpjq+p8HKA898svg=; b=KnhZ1zahR4LJbgVSgJW3BWtT/RxPj/yLG4T7pblhyIJUwy6gISNLACVU9u0uFkOTEWH/1O Ts1aABJIRlNRAbwpIu1y1QUU2UIQH1QtklhBZ7Va9/skcPx8wExKJqJIx7jGhgHTWOMr30 Qk4sK8cYDd8+C5k4LJ3mlZCrBJ/ntVGScm9d8IWpffRNUnVgZdMUhqIXlfiJ8SZtVleReL awvmHTPpmuWXL2NnqSuCzidWoXV8deoaKVJUMjIgdRA2MzeasYpEIsp7159cCEO4m2bGjh KolNvG9ARJWRnSq16GJ18T8J93eHeFrWNyoazwqxCoZTo33lmOAWTWtdVQ/hiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764819180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AZ54/Hq32rSx6egxB/a+eHZukPPvpjq+p8HKA898svg=; b=teDvlJq/vX6+9dtPzGWxViaF4JD73+ADH1xKa3+UuaaoM+7gsZTtHjdjYwIGYuzFp/Acy3 JrDdcHAMkIzR1HAdkGw5WW/ieH3WKJ0eSlgDZZU6vj7Iv2gI0mpm9Fr6oUrW1eKlgbExpY +bIiN/E6pA/8matM2e7mKq5HabhNz3toZ7mrTJyGE3MQeK5tCw80t7Aj95Y+b378TDAsqE vkcWI2HQS88EsWB5yCVQgrNiJSXLpoRSCN9UKbl5ZwEVO9dvLhSGow0xq+r+WnlB1AYqam KXZHd/3AiXISekpE6/uDB0BGhWabzkzdbBLkExoVpEwxDYcQRIgNjtU7Qska5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764819180; a=rsa-sha256; cv=none; b=rfwz4GA9NVUbcbyFSDLDQ42bAB6rMgOyvsaYOHqYHPSKBXZMcijeMnCXp9LBNcxMgwZfww pWGJdC7j87hdVC1o+dE/fkA3h2+PbpQzGti2mccSNPuvmLU+MZgOEMNd9zqbIj3+TGJdVN zDx5xSLElxdEGKhENo6fsYaEHsm8pcGbzE9u06hz+Cvenv1YpSfeN653IySahaNKJH3QSj ZQaaaYUda1sUj/LEZK65z59g2GIN2lmeoKf0LyEK55eGLTGgmC0O5X4hjbjKDPetbkHLVH OPdrhj0/ZPPjKbgWpSSinc8+q2xjOiMvoVz+qcgCV7/pdZnIlBxlLIa7uSwOhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMKpN0Pc1z15hW for ; Thu, 04 Dec 2025 03:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 317fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 03:33:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Pau Amma From: Alexander Ziaee Subject: git: 9ec8196f68ba - main - vidcontrol.1: Video buffer dump is syscons only List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ec8196f68bac015965164f7f1a65c619bab4e85 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 03:33:00 +0000 Message-Id: <693100ec.317fa.12795cc6@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=9ec8196f68bac015965164f7f1a65c619bab4e85 commit 9ec8196f68bac015965164f7f1a65c619bab4e85 Author: Pau Amma AuthorDate: 2025-12-04 03:28:17 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-04 03:31:43 +0000 vidcontrol.1: Video buffer dump is syscons only Fixes: 1f4442f71fa3 (be explicit that -p and -P are sc(4) only) MFC after: 3 days Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D53878 --- usr.sbin/vidcontrol/vidcontrol.1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1 index 91804facce8e..a32b5a10f57c 100644 --- a/usr.sbin/vidcontrol/vidcontrol.1 +++ b/usr.sbin/vidcontrol/vidcontrol.1 @@ -12,7 +12,7 @@ .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" -.Dd July 7, 2024 +.Dd November 22, 2025 .Dt VIDCONTROL 1 .Os .Sh NAME @@ -502,9 +502,6 @@ The .Nm utility uses the .Xr syscons 4 -.\" is it supported on vt(4)??? -or -.Xr vt 4 .Dv CONS_SCRSHOT .Xr ioctl 2 to capture the current contents of the video buffer. From nobody Thu Dec 4 06:15:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMPPj6FQYz6JdlD for ; Thu, 04 Dec 2025 06:15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMPPj5ScWz3FC8 for ; Thu, 04 Dec 2025 06:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764828921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5t3v1w/kgJyaRCjgHHus67Xj8d65ckKcbzMIXqXnaw4=; b=GaTta3YgcevLOioa0eobzFPIDdBMUNcEPj1LGEDGm1XVc9dWK1mZPayyimOADLIwqzxOMU ElBSAJVTnVcS2OhVNc/Hox3Te5Bsd2ZSn18NsiWLOkiJzfByghM9jARCD6DMpA2ixyI5eD r4M2WxMDn4+0e9jolGKw9okkU1RsflXWOXI2Y2RVsanQPmk642PA/99FXfoasJl66QU6bu QjfWuEmooywA8ejBCZGVggBWJDrV3RlZrL7gP5WFmK7ole3Z4r7D82Yz4SKkytJU5IiVGf x3nJ7+bPbmhpJeF2E5NXxmwsuhufULa4YqRRUXComgzMCEwnoi6v9d+aUeQjYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764828921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5t3v1w/kgJyaRCjgHHus67Xj8d65ckKcbzMIXqXnaw4=; b=xB5U0vChd2V8DFbQoPaLzmQ0+LI+oydX2o68NPadaPcRJFsKBhY0nqmpZ80HJe2lVqVmNY zXQdnAFJOB2Nv8+j6rZ0x79T5sRJqqv2iRPm1IMXGU6ckGcvdo3FfhuslPb8OafEoNgOJ7 HvlGudUKn8y4MrgUHjqQExaHmcjr6KdfAtuQkZU5XP4rBLOtCL0TgNPpEra4LVAu8cWT+X QRvj+AJ5WcCgWEgLmEohCOL4Wp4Ofu7IR8bdiIUc5kM5JPdRcOUmld0jByIFrVM2uWGdsc hZ4m9oukZHhB1GVg2nMMdcKZrGO8MG94keE9xwmhDPKnEUii8aX0HVAr4PlQvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764828921; a=rsa-sha256; cv=none; b=PohZUjLq7GkyRBGGkJmSwCkd5/b21HkflWnuLnV8SZqbm3dn8CEIIdorbaocj1+Jq7sLRe vyQC+E1x0jHZbzbUQiupbGZfe0gwf7AhRiprvNjOPsb3Pv7NXe0tcappeY7uFwgLYCIh/h f1QDOvPwhA5AIT2YCwzVjpJ2MLGz86Rw5CDSjfD/l1FWSAfj7ufhc+zFOnENsMWMGwIRv7 pnotal6kzrGmYTQUzs5Doqf6And2An1UCz2iPp57jkfXQHSv/XzJB5ffRm/86U38P/ZHvE zQU3Z8IdyCiQM9M/wxphK+/0Oe8ecZtGb5q6vT8TgoDJqKmDUKnEtKfqyRYUaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMPPj53HNz1B9G for ; Thu, 04 Dec 2025 06:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23083 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 06:15:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a8b0208e7e98 - main - nvme: Fix devd logging of SMART_ERROR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8b0208e7e989c0876f73e1953f66542678b9004 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 06:15:21 +0000 Message-Id: <693126f9.23083.6299254e@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8b0208e7e989c0876f73e1953f66542678b9004 commit a8b0208e7e989c0876f73e1953f66542678b9004 Author: Warner Losh AuthorDate: 2025-12-04 04:05:06 +0000 Commit: Warner Losh CommitDate: 2025-12-04 06:04:34 +0000 nvme: Fix devd logging of SMART_ERROR Remove extra arg so that we have type=SMART_ERROR rather than an invalid message. Also log all aens. Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 1ad4735cbef8..55b6d6b745cf 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -677,7 +677,7 @@ nvme_ctrlr_log_critical_warnings(struct nvme_controller *ctrlr, nvme_printf(ctrlr, "SMART WARNING: unknown critical warning(s): state = 0x%02x\n", state & NVME_CRIT_WARN_ST_RESERVED_MASK); - nvme_ctrlr_devctl(ctrlr, "critical", "SMART_ERROR", "state=0x%02x", state); + nvme_ctrlr_devctl(ctrlr, "SMART_ERROR", "state=0x%02x", state); } static void @@ -1143,6 +1143,10 @@ nvme_ctrlr_aer_task(void *arg, int pending) goto out; } + nvme_ctrlr_devctl(ctrlr, "aen", "type=0x%x info=0x%x page=0x%x", + NVMEV(NVME_ASYNC_EVENT_TYPE, aer->cpl.cdw0), + NVMEV(NVME_ASYNC_EVENT_INFO, aer->cpl.cdw0), aer->log_page_id); + aer->log_page_size = 0; len = nvme_ctrlr_get_log_page_size(aer->ctrlr, aer->log_page_id); nvme_ctrlr_cmd_get_log_page(aer->ctrlr, aer->log_page_id, From nobody Thu Dec 4 15:17:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMdRJ6bJ6z6JDYH for ; Thu, 04 Dec 2025 15:17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMdRJ5xmRz3DCZ for ; Thu, 04 Dec 2025 15:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764861452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qH4NKrljj3wZobl2eDWlL7J9wjDeQDng2aWCtETjGeE=; b=IrPYYVI00BYa2stjFqNjtLiIcacXVJKEEWcsmiNbxpZdqmKvfV8jx8fdlMrIRgf4HOMH7n abqZH/CSW5qftY4toVUKbvI01Wz7BFeuGZt2JAi/eIP3VheETBhkYEXkpbNhrMJEnT2Mrr dwKVCRurzFo3/vXdABFmDXpaf+mvrMZ4BXk8lCPJOd0MJNOufcBt6UkROWtGvsxp7Iz0gB NbarJwer4qHTodbKh1DoOgiZGJrPKvdDHbA4H9zH/7ZtWkUCxD5Fiy7jEoF1UyqdMqhK+a YCBOZBrZI+FrHOpiCFnS1c5aVOazzbUGWvYsmzpNAocgb03weJnxfyPSWbyhDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764861452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qH4NKrljj3wZobl2eDWlL7J9wjDeQDng2aWCtETjGeE=; b=lFhnZE7A6FOXNfEvkxjh9GycljuI1o2eU+OuwvjfYdyd072exHYsgRcF75HyMj4i8D9rQr pw4NgNx1atbkebsp+7MCYnby1hFSIQKT5AqSK8DGhXRMapH7nSX8hsZIoFrYARJbgLnyfb sL3v8dtN+/zMjabxfDYu2tEBONU7iCQwAnbF6IFSClqy7DgJ1DUqCQStqTHx7pMDLRlcHg 0cvba5qtN39GlPn3+IeBr/6GL/+Jc7mUnKKnw+f+DBVjFbYfT6X4QMHY1ebdUD00rKE2rS 6O28awfNogcEFP9OA8h0R01ph4qX8XayLr7MkxlKFhobPvIa3FhkD+DU6E37Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764861452; a=rsa-sha256; cv=none; b=rXk/45W2pLLx4q4x+bThjW88qLIUEbTopuKRpZK0rWEwrk3TxZJLmywdzbJSd4aJB9rs9C rk7+CPBBQnyy7RHRYP9kd9viWuB/YSt7LGpFUBJ6PaYwr8qN/gCyZBcc9rYpMKdjBTZRoQ yU98IQcZsksh6nk5rrq5ViCtAgCN0ZYOldQ7GpWswFAelqX9Nyrf6CDHIdEgKRygmtIa/v cqA6MZLtfvFRXb8fUSJwEdyVGNv5SbZbx1NYpudmNjqp3I9KdnNqgwB9cZjZK5fppHUdP6 ukiYvN7KO3OAv150Fp7tuTtGfZZGPxO3fMQOxR+9rf/WxkQNyrkzMYz3fNFVjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMdRJ4bZKzD8Q for ; Thu, 04 Dec 2025 15:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31829 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 15:17:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 15afd75e6710 - main - ipsec: Fix typos in references to IPsec's ESP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15afd75e67102f81c37adbf11966e48685bd7be7 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 15:17:32 +0000 Message-Id: <6931a60c.31829.37b94005@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=15afd75e67102f81c37adbf11966e48685bd7be7 commit 15afd75e67102f81c37adbf11966e48685bd7be7 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-12-04 15:17:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-12-04 15:17:12 +0000 ipsec: Fix typos in references to IPsec's ESP ESP is "Encapsulating Security Payload", not "Encapsulated Security Payload". This patch fixes all the place in the tree I could find with `grep -i encapsulated security`. MFC after: 3 days Reviewed by: ae Differential Revision: https://reviews.freebsd.org/D53769 --- sbin/ipfw/ipfw.8 | 4 ++-- sbin/ipfw/ipv6.c | 2 +- sbin/ping/ping.8 | 4 ++-- sys/netipsec/esp.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index ddfdc35ce651..249bd195b4de 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,5 +1,5 @@ .\" -.Dd April 18, 2025 +.Dd December 4, 2025 .Dt IPFW 8 .Os .Sh NAME @@ -1669,7 +1669,7 @@ Destination options .Pq Cm dstopt , IPSec authentication headers .Pq Cm ah , -and IPsec encapsulated security payload headers +and IPsec encapsulating security payload headers .Pq Cm esp . .It Cm fib Ar fibnum Matches a packet that has been tagged to use diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c index e6139976e6cb..e6eb07af26dc 100644 --- a/sbin/ipfw/ipv6.c +++ b/sbin/ipfw/ipv6.c @@ -289,7 +289,7 @@ print_ext6hdr(struct buf_pr *bp, const ipfw_insn *cmd ) sep = ','; } if (cmd->arg1 & EXT_ESP) { - bprintf(bp, "%cencapsulated security payload", sep); + bprintf(bp, "%cencapsulating security payload", sep); } } diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8 index 43dca1148e16..9aeb19c1a879 100644 --- a/sbin/ping/ping.8 +++ b/sbin/ping/ping.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 15, 2023 +.Dd December 4, 2025 .Dt PING 8 .Os .Sh NAME @@ -534,7 +534,7 @@ IPv6 address of the final destination node. .Ss Experimental options only for IPv6 target .Bl -tag -width indent .It Fl E -Enables transport-mode IPsec encapsulated security payload. +Enables transport-mode IPsec encapsulating security payload. .It Fl Z Enables transport-mode IPsec authentication header. .El diff --git a/sys/netipsec/esp.h b/sys/netipsec/esp.h index 50a79384a6b1..27f2fd1c683a 100644 --- a/sys/netipsec/esp.h +++ b/sys/netipsec/esp.h @@ -32,7 +32,7 @@ */ /* - * RFC1827/2406 Encapsulated Security Payload. + * RFC 1827 & RFC 2406: Encapsulating Security Payload. */ #ifndef _NETIPSEC_ESP_H_ From nobody Thu Dec 4 15:20:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMdVP54PDz6JDt3 for ; Thu, 04 Dec 2025 15:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMdVP469vz3DkM for ; Thu, 04 Dec 2025 15:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764861613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jVqlOeA78lF0j4a8sX75Aq8bQ7CYbRr9m/PvevFruYw=; b=cPEA0/2YTcEADFAuS7FMTEMR6rp/qkrGYvguW+Tg8c57+QpEUrTibLFyWFVJtmQyJyz4bQ 1QVnCj2qjptLf3LdnvPomdoCAhzUWEufp/+OD/5tecZjeh59V2KB8qIpLG6l4m5x7SPZkg ZC6Pv1NJa6w3Cs9lXeh87wASWyuZJ0M5PEvlpaZ600De+aSEmo9qj3apsWImXeNvCc4wuR faEtxiUyQlh1osp+aaNirlDdNmxPP2Wx32xYDAD3+NOxC4dAHLaPpOdxMJ+gFBvWCMGx9Q 6Qok4rudmluz2Ad8387m2XwTcSPJwMwDnN8Ism7TSfIScsQGNt7fRwzhId7tJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764861613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jVqlOeA78lF0j4a8sX75Aq8bQ7CYbRr9m/PvevFruYw=; b=wiI5oSe2geYY/8W7q95j6Wxw3M8SoaI+yDBjsGbgVsbTViXGz+75C0Cyzy0yG35/y4qPB3 y25Az5UU+QtbYa2E+FER3zq1Mu6Jkspkx5hXUj5i4v0rMFkKRSKwOmWLtJbLEDccFdtIN6 Qlg/FhRUE+9CQzbJGaAD7r6cLXwaY/q3U2Epk042KIhfuIzKyH7ZTXyiumbbfKVamIFWvj pHElHSNFGsYARgumpWxQ1hC4vw4cbAejbYR9d4zmKMfle6/p8gzOcRHIssXKf/nYUMOkZq SRiApGQQi5Uhc9I2P5xmp/jCBuYEZggubQIoq7w111OWkjQuTj6Irtitg/6M0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764861613; a=rsa-sha256; cv=none; b=pZt0CgLZjm1oNQyunU3V8BUkZWlWfey9mhVIDOrJ3GG+mtZAZfJNP4SrZDnqv7mT+wHxvh wlTGNlZxPvGIrMmiQyWR6DsBICw6w1orWi3ussRWKFX7A79Ys8HDaHTKjS72vkY+QHUU7u gcBC92Bq0RAMhEfqQhsH3jqM/UsPmUYNAtSSej7RaSywcME8PhqfCR11DuVzP+U39uQXsU RDmUUBWidc82d9DpK8pUOLKAy5adV6NpIUhpAI8tXGORIeLmwbsFxIw8NDvmxUS87bdtkV UagJKYm/hxsyS+VYv2PAwNoDyTBMUBe+Y13/9IDu2d3bOENmgxSBSbWky5Z1fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMdVP3QCWzCpt for ; Thu, 04 Dec 2025 15:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30ae0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 15:20:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 8740d7e4d183 - main - uio.h: Indent struct uio according to style(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8740d7e4d183189d259163aa30179ad14c77c0c4 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 15:20:13 +0000 Message-Id: <6931a6ad.30ae0.396b9777@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=8740d7e4d183189d259163aa30179ad14c77c0c4 commit 8740d7e4d183189d259163aa30179ad14c77c0c4 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-12-01 18:32:21 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-12-04 15:18:55 +0000 uio.h: Indent struct uio according to style(9) Approved by: christos (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54071 --- sys/sys/uio.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/sys/uio.h b/sys/sys/uio.h index 05c1ed640b63..58bb7b13b253 100644 --- a/sys/sys/uio.h +++ b/sys/sys/uio.h @@ -50,13 +50,13 @@ typedef __off_t off_t; #ifdef _KERNEL struct uio { - struct iovec *uio_iov; /* scatter/gather list */ - int uio_iovcnt; /* length of scatter/gather list */ - off_t uio_offset; /* offset in target object */ - ssize_t uio_resid; /* remaining bytes to process */ - enum uio_seg uio_segflg; /* address space */ - enum uio_rw uio_rw; /* operation */ - struct thread *uio_td; /* owner */ + struct iovec *uio_iov; /* scatter/gather list */ + int uio_iovcnt; /* length of scatter/gather list */ + off_t uio_offset; /* offset in target object */ + ssize_t uio_resid; /* remaining bytes to process */ + enum uio_seg uio_segflg; /* address space */ + enum uio_rw uio_rw; /* operation */ + struct thread *uio_td; /* owner */ }; /* From nobody Thu Dec 4 16:44:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMgN31vQkz6Jbxf for ; Thu, 04 Dec 2025 16:44: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMgN31Fyrz3Mym for ; Thu, 04 Dec 2025 16:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764866691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4FAk5qrjCVCWhJS09HKihPZdUFbHU7jsvMVC8CRYnhc=; b=jj/IDsgSbSqzFkQpKWqcaZrUWx5eSwo/5CQPorUzj7YhiN553HOKZoOeyqctT470az/dT8 xJwy8vNQlQeyuJlxf+NEV5k995qOZG7BmHSG1/DHHHVzEXFtsmTIdQDyfAP2UnnYXAG06Y CRR2N2cFpc1xrMK+pblN8lYXkd1GULaH/zVSY7IOxWQwTO9P+HOUiaDQlZxsjR7KAigNm9 HAnoQRMjz9d+6g9GiKWuoCR8xXagqqYMue2dnkUIYEsEPr0k6zpy5wC8ZIRsV9+E0QTGVZ hL8Mr7MrmCMb8StxAOVnOqCyvICLE/MdKkt6FcuH8Wz9y/NPNqsc8waAuhjvWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764866691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4FAk5qrjCVCWhJS09HKihPZdUFbHU7jsvMVC8CRYnhc=; b=l049lwKGR8iSkiqGz/Vwc3ulpJg0x+fJgQBTxQ0pXi7BsfTVVwtlFa5ViqZ/fwo1Ytrr89 W7DGOvlazBdxFjnmq8rehRaSdlZiBYcYPulVgv1qhyWnw+2RJNxM8Q9XpcZmh1Mg2ZmiRm wFM0j/CVo86WvZCtT9IMG8xbJqHOqwu9dBIop3hjj9Li2mKd4O2ztflERhk1Wdhm+stfRo qHl+cBb00suw8xJr+iKuO62lMHMLXm74GygnSe76fQKQ2RxkfW7BXEeE0NnNa4zKMTkwVi Lik+9GpL/FyW3lUvAiAJGIiDp5YlEc4qciJ/8SbVEC/2ZvHgzvySp2rHrqPMLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764866691; a=rsa-sha256; cv=none; b=dA5dDdmpJMI5tVNw0Z2bfJizEnxIsynnErG4vMNVOWW5j4NO8MG6VOGiSFihbSsDBlI/kk MJ0fmtc9uUgFB0gf5NoEQ+T8SvXz/ElqNXbgZMGQMQZuffExdvsWeIWwp2E8SOwbyG0KzW aD145yUp90XT/i/s4WPt1qNVd1hMYv6h+yLEryWEY1onU1p0XuTyP612INZFe8vfM/Q54g EP6Pz6gHeAP0uarwUVfHmNhFcMVLNcWAMueNQmO3Dngxs8eJEa/JbgEG0c/bXZTPcJMLo+ vb5MCoW0dFmyWjr6M7uWag4J7eqNx/UNq0WTwlUhwMKMePFS/9FLwzmjM4bIpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMgN30gdnzYMX for ; Thu, 04 Dec 2025 16:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38053 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 16:44:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 215c58a1c677 - main - pf: make unhandled_af() inline List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 215c58a1c677aa191db9afcc1d75d7ba13426a7f Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 16:44:51 +0000 Message-Id: <6931ba83.38053.1ae97689@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=215c58a1c677aa191db9afcc1d75d7ba13426a7f commit 215c58a1c677aa191db9afcc1d75d7ba13426a7f Author: Gleb Smirnoff AuthorDate: 2025-12-04 16:29:17 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-04 16:29:17 +0000 pf: make unhandled_af() inline Otherwise you just can't include pfvar.h without compiling pf in. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D54064 --- sys/net/pfvar.h | 6 +++++- sys/netpfil/pf/pf_ioctl.c | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index ce266a267f3c..7568b83f89fd 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -571,7 +571,11 @@ extern struct sx pf_end_lock; #ifdef _KERNEL -void unhandled_af(int) __dead2; +static inline __dead2 void +unhandled_af(int af) +{ + panic("unhandled af %d", af); +} static void inline pf_addrcpy(struct pf_addr *dst, const struct pf_addr *src, sa_family_t af) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 5ec67021068b..6774aaac2ecd 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2521,12 +2521,6 @@ relock_DIOCKILLSTATES: return (killed); } -void -unhandled_af(int af) -{ - panic("unhandled af %d", af); -} - int pf_start(void) { From nobody Thu Dec 4 16:44:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMgN43CrZz6Jc2Z for ; Thu, 04 Dec 2025 16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMgN4215wz3MkZ for ; Thu, 04 Dec 2025 16: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=1764866692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=omHjsj2VI0L/Nr1Hkb8nNPGgIbzhMhaMRlg552WOJ3k=; b=UqnpJRQooU+WNnIPurluBnbpV4DG+2nupxiv6zgiHbxOeRC3cO8JZZ3Ubwtc93Gqg/pO8e jkhdw695248W6w4590SBtIkEwOvLc+KnslKtuwEngeD0D5uByrBtt8OCmdsfXy/YQ+nE8p EqHmb/+cI+Y5zGGY4JPM9ovnX2MX5z60iMJ6wvuj2bsjc9RaqyGAWHq0Qoqa5nj0EFtBpT h+VrPXI7t1rl4r/LWAVVqb427DgTZbPOEQ6n3SsQ6znpBDK+d1Uw23phBF+1GtRIIKa6iO iUAylWBWxOx0iXL8Le6dxGpgVHDB/BZqkwwcUpfnNEqaBYmsIt7m7LYQgUbWyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764866692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=omHjsj2VI0L/Nr1Hkb8nNPGgIbzhMhaMRlg552WOJ3k=; b=W621sHPEnpvoQufMZIiH/7y1LR9rqqN2nYtDZKyPRa7sMWfaSqZZAOeDRYX/wdifS8mXUo k7OlzaXl7adu/Oz4Twnb+wRM3vBkhnFsNi+Osm3StfcorwhFXSZcLoOw34gf29kH7KBFQ6 9EWyxlnrXWeXhLbtIWc6l8EmZ2DM5bskWJsUp2fmtpjbFxZ8o/QJtSyKmSX4H0Rd6t39J6 19N3cPTWq9ZJG3vpxmYcgwV+PbDh1F+gD9BG1EXgiYbrIsInjXUsHFeD+Mhim0uo0mfouu 5VbW816gSXyv+1LNM4F6QAuTeY1NFGhqJB6XTo4UO75h8XRaJp4qQCk078+CrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764866692; a=rsa-sha256; cv=none; b=YbgLUlh5yI6ZPz3+nEHD6oRsmuiH2NPI+Ktta1yIT9+nMHYKZdNRuiqqFKJQY/M5xrKpu/ moR50qqOA861Act6ZMHF5PiOdcuJuGgSplYPgXLYgt9aUc0eKaDM4hXCFyb5vxdHBvHpt5 4eMQB8IpG27wtFZRH1hYaycyzF+d8HaptbQW1jLJgioUFW1NXHTQZYgEJXsw7RO4Z+sBYZ J7XK5RqBzj9IJpSo1nv8dwM2JUB33dMRjBxNYJaoFrkAY1yG4+vu10I7lrTanPEDCPSEgR CJdza0Ftstf4XuljocVaq4xtSdHgHUe5FSkJ6wWZReWnTMtbmMHu+gn+gQSWxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMgN41P5JzY6x for ; Thu, 04 Dec 2025 16:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a188 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 16:44:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 575efcfff22f - main - sendfile: remove SF_SYNC in FreeBSD 16.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 575efcfff22f5d75fc3ac6201f11e5eae46ec9ce Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 16:44:52 +0000 Message-Id: <6931ba84.3a188.2d5227ac@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=575efcfff22f5d75fc3ac6201f11e5eae46ec9ce commit 575efcfff22f5d75fc3ac6201f11e5eae46ec9ce Author: Gleb Smirnoff AuthorDate: 2025-12-04 16:37:10 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-04 16:44:21 +0000 sendfile: remove SF_SYNC in FreeBSD 16.0 See d17cbe46983c for details. PR: 287348 --- sys/kern/kern_sendfile.c | 88 ------------------------------------------------ sys/sys/socket.h | 2 +- 2 files changed, 1 insertion(+), 89 deletions(-) diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index 8438298afc0e..7ffb09c58b9c 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -68,7 +68,6 @@ static MALLOC_DEFINE(M_SENDFILE, "sendfile", "sendfile dynamic memory"); -#define EXT_FLAG_SYNC EXT_FLAG_VENDOR1 #define EXT_FLAG_NOCACHE EXT_FLAG_VENDOR2 #define EXT_FLAG_CACHE_LAST EXT_FLAG_VENDOR3 @@ -100,43 +99,6 @@ struct sf_io { vm_page_t pa[]; }; -/* - * Structure used to track requests with SF_SYNC flag. - */ -struct sendfile_sync { - struct mtx mtx; - struct cv cv; - unsigned count; - bool waiting; -}; - -static void -sendfile_sync_destroy(struct sendfile_sync *sfs) -{ - KASSERT(sfs->count == 0, ("sendfile sync %p still busy", sfs)); - - cv_destroy(&sfs->cv); - mtx_destroy(&sfs->mtx); - free(sfs, M_SENDFILE); -} - -static void -sendfile_sync_signal(struct sendfile_sync *sfs) -{ - mtx_lock(&sfs->mtx); - KASSERT(sfs->count > 0, ("sendfile sync %p not busy", sfs)); - if (--sfs->count == 0) { - if (!sfs->waiting) { - /* The sendfile() waiter was interrupted by a signal. */ - sendfile_sync_destroy(sfs); - return; - } else { - cv_signal(&sfs->cv); - } - } - mtx_unlock(&sfs->mtx); -} - counter_u64_t sfstat[sizeof(struct sfstat) / sizeof(uint64_t)]; static void @@ -179,11 +141,6 @@ sendfile_free_mext(struct mbuf *m) sf_buf_free(sf); vm_page_release(pg, flags); - - if (m->m_ext.ext_flags & EXT_FLAG_SYNC) { - struct sendfile_sync *sfs = m->m_ext.ext_arg2; - sendfile_sync_signal(sfs); - } } static void @@ -204,11 +161,6 @@ sendfile_free_mext_pg(struct mbuf *m) pg = PHYS_TO_VM_PAGE(m->m_epg_pa[i]); vm_page_release(pg, flags); } - - if (m->m_ext.ext_flags & EXT_FLAG_SYNC) { - struct sendfile_sync *sfs = m->m_ext.ext_arg1; - sendfile_sync_signal(sfs); - } } /* @@ -763,7 +715,6 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, struct mbuf *m, *mh, *mhtail; struct sf_buf *sf; struct shmfd *shmfd; - struct sendfile_sync *sfs; struct vattr va; off_t off, sbytes, rem, obj_size, nobj_size; int bsize, error, ext_pgs_idx, hdrlen, max_pgs, softerr; @@ -775,7 +726,6 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, obj = NULL; so = NULL; m = mh = NULL; - sfs = NULL; #ifdef KERN_TLS tls = NULL; #endif @@ -801,17 +751,6 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, SFSTAT_INC(sf_syscalls); SFSTAT_ADD(sf_rhpages_requested, SF_READAHEAD(flags)); - if (__predict_false(flags & SF_SYNC)) { - gone_in(16, "Warning! %s[%u] uses SF_SYNC sendfile(2) flag. " - "Please follow up to https://bugs.freebsd.org/" - "bugzilla/show_bug.cgi?id=287348. ", - td->td_proc->p_comm, td->td_proc->p_pid); - sfs = malloc(sizeof(*sfs), M_SENDFILE, M_WAITOK | M_ZERO); - mtx_init(&sfs->mtx, "sendfile", NULL, MTX_DEF); - cv_init(&sfs->cv, "sendfile"); - sfs->waiting = true; - } - rem = nbytes ? omin(nbytes, obj_size - offset) : obj_size - offset; /* @@ -1042,14 +981,6 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, m0->m_ext.ext_flags |= EXT_FLAG_CACHE_LAST; } - if (sfs != NULL) { - m0->m_ext.ext_flags |= - EXT_FLAG_SYNC; - m0->m_ext.ext_arg1 = sfs; - mtx_lock(&sfs->mtx); - sfs->count++; - mtx_unlock(&sfs->mtx); - } ext_pgs_idx = 0; /* Append to mbuf chain. */ @@ -1120,13 +1051,6 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, !((off + space) & PAGE_MASK) || !(rem > space || rhpages > 0))) m0->m_ext.ext_flags |= EXT_FLAG_NOCACHE; - if (sfs != NULL) { - m0->m_ext.ext_flags |= EXT_FLAG_SYNC; - m0->m_ext.ext_arg2 = sfs; - mtx_lock(&sfs->mtx); - sfs->count++; - mtx_unlock(&sfs->mtx); - } m0->m_ext.ext_count = 1; m0->m_flags |= (M_EXT | M_RDONLY); if (nios) @@ -1263,18 +1187,6 @@ out: m_freem(m); if (mh) m_freem(mh); - - if (sfs != NULL) { - mtx_lock(&sfs->mtx); - if (sfs->count != 0) - error = cv_wait_sig(&sfs->cv, &sfs->mtx); - if (sfs->count == 0) { - sendfile_sync_destroy(sfs); - } else { - sfs->waiting = false; - mtx_unlock(&sfs->mtx); - } - } #ifdef KERN_TLS if (tls != NULL) ktls_free(tls); diff --git a/sys/sys/socket.h b/sys/sys/socket.h index cf1d95da6168..76a1652644bd 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -662,7 +662,7 @@ struct sf_hdtr { */ #define SF_NODISKIO 0x00000001 #define SF_MNOWAIT 0x00000002 /* obsolete */ -#define SF_SYNC 0x00000004 +/* was SF_SYNC 0x00000004 */ #define SF_USER_READAHEAD 0x00000008 #define SF_NOCACHE 0x00000010 #define SF_FLAGS(rh, flags) (((rh) << 16) | (flags)) From nobody Thu Dec 4 18:02:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMj5B1JPfz6JjQ4 for ; Thu, 04 Dec 2025 18:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMj596fpbz3bFT for ; Thu, 04 Dec 2025 18:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764871325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUZH7EEPkDTjc/ARG1ZnRzYaDiTsTrKmzporLQ4+MJc=; b=uzyD8t9uqGX9+F0bmDPhGlp1eZxyCvNkYp/tS7GNOgKOYfYs5ut0iWVeG0N5itrj7GmnKa avYs72mgcZmvd6lxR50iPUyqianeO2AVi3Nvo2I+ajPnXTL5tzPs7x2EIwKuWgo4GPK+Gz NBMqF4vYbSZFlBeGTXZLBi6YPLneu+yISFHuHCmACYqpaVg5MG1eeLlAW0S2u/BadcDJ+v fCj1Urqfi3nVpNlBMMjcz/uu7tQVxgPNYwE6yPtn+bFxk8FH2DL8+ispqGDLImPZ+R1lf4 e18PSmsLbDux0EBu8k9T6u6dIIClGYifkP8Ln3411hy0+1Gj4BUIXO5Cb6n8WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764871325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUZH7EEPkDTjc/ARG1ZnRzYaDiTsTrKmzporLQ4+MJc=; b=fGqwwoONRJsrSQjW0STlTqLxbGaDKLxKfv0WZvSnhqUpBx8VloF0WnhWFOgDlTlUrGtayy EGANdOYRFTQnU0qLrfkNgVhe/KnSNdDGp5QYLPXkV4gmVqVDLrOz39UjcKxB3c1sZ6pogg kwCgyK9OyYoj9v7+5Vyn9i4kebhuiPRNuNw01btE+jSb8qIipxQIuFHKnJ4JFAgQ4qmi95 TP8REqZgAt63gK+8zXiioF2oGLfeaVxR/qFxcTc+iHAqqh0DOFu6+hozssMTnf54xBFqr7 6jl/oJeeeKN7HaXGhMe5Vw9s4NtX18WZLR3n3M4WwnzIasIYyoyYsuxoh42y1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764871325; a=rsa-sha256; cv=none; b=Yz9vTINT/o8bbVV/Xkb+xWkpqjWS0g6CHHrOfWhKUM6H6MhOjvdoA1GAgsxciMGd+mbpQg C23zX2Ml77Tra3rXb0cyRRzDuL4DQFCVOtFmAQbWU8xnleQoLlcNHMcutj8dyq7Gl14fs/ fZyCKP7Zv6rKr9Zv95av163qWhT+njGAqhfaGowAIpqGQREr4biBDXFwJHEENJxvC8m8q2 ND+la4wMQS3aEL99g8dHXwAahhr0Qlu15mL0IWdYg6I9rc4kh0D79P3fxwTdIZKw4Nyj7n 7//PPy2uMHSW/wLNTfv5sQm6hvQMuAbSKVjn2DNVcVeyk6yoZrX4iJH1ETi5BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMj596518zbcp for ; Thu, 04 Dec 2025 18:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fd78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 18:02:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: =?utf-8?Q?Ana=C3=ABll?=e CAZUC From: Mitchell Horne Subject: git: 51a01f3debff - main - pmc: add emerald rapids model List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 51a01f3debff8abf63c7cc21db9523c8feb53823 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 18:02:05 +0000 Message-Id: <6931cc9d.3fd78.1d986a40@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=51a01f3debff8abf63c7cc21db9523c8feb53823 commit 51a01f3debff8abf63c7cc21db9523c8feb53823 Author: Anaëlle CAZUC AuthorDate: 2025-12-04 17:36:32 +0000 Commit: Mitchell Horne CommitDate: 2025-12-04 18:01:00 +0000 pmc: add emerald rapids model This commit adds emerald rapids CPU model to hwpmc/libpmc. JSON event definitions are imported from Intel perfmon version 1.06. Reviewed by: mhorne MFC after: 1 week Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D49228 --- .../pmu-events/arch/x86/emeraldrapids/cache.json | 888 +++ .../arch/x86/emeraldrapids/floating-point.json | 214 + .../arch/x86/emeraldrapids/frontend.json | 389 ++ .../pmu-events/arch/x86/emeraldrapids/memory.json | 344 ++ .../pmu-events/arch/x86/emeraldrapids/other.json | 315 + .../arch/x86/emeraldrapids/pipeline.json | 962 +++ .../arch/x86/emeraldrapids/uncore-cache.json | 6248 ++++++++++++++++++++ .../arch/x86/emeraldrapids/uncore-cxl.json | 450 ++ .../x86/emeraldrapids/uncore-interconnect.json | 6199 +++++++++++++++++++ .../arch/x86/emeraldrapids/uncore-io.json | 3617 +++++++++++ .../arch/x86/emeraldrapids/uncore-memory.json | 3308 +++++++++++ .../arch/x86/emeraldrapids/uncore-power.json | 197 + .../arch/x86/emeraldrapids/virtual-memory.json | 165 + lib/libpmc/pmu-events/arch/x86/mapfile.csv | 1 + sys/dev/hwpmc/hwpmc_intel.c | 4 + sys/sys/pmc.h | 1 + 16 files changed, 23302 insertions(+) diff --git a/lib/libpmc/pmu-events/arch/x86/emeraldrapids/cache.json b/lib/libpmc/pmu-events/arch/x86/emeraldrapids/cache.json new file mode 100644 index 000000000000..ab09bd9fb409 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/emeraldrapids/cache.json @@ -0,0 +1,888 @@ +[ + { + "BriefDescription": "L1D.HWPF_MISS", + "EventCode": "0x51", + "EventName": "L1D.HWPF_MISS", + "SampleAfterValue": "1000003", + "UMask": "0x20" + }, + { + "BriefDescription": "Counts the number of cache lines replaced in L1 data cache.", + "EventCode": "0x51", + "EventName": "L1D.REPLACEMENT", + "PublicDescription": "Counts L1D data line replacements including opportunistic replacements, and replacements that require stall-for-replace or block-for-replace.", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Number of cycles a demand request has waited due to L1D Fill Buffer (FB) unavailability.", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.FB_FULL", + "PublicDescription": "Counts number of cycles a demand request has waited due to L1D Fill Buffer (FB) unavailability. Demand requests include cacheable/uncacheable demand load, store, lock or SW prefetch accesses.", + "SampleAfterValue": "1000003", + "UMask": "0x2" + }, + { + "BriefDescription": "Number of phases a demand request has waited due to L1D Fill Buffer (FB) unavailability.", + "CounterMask": "1", + "EdgeDetect": "1", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.FB_FULL_PERIODS", + "PublicDescription": "Counts number of phases a demand request has waited due to L1D Fill Buffer (FB) unavailability. Demand requests include cacheable/uncacheable demand load, store, lock or SW prefetch accesses.", + "SampleAfterValue": "1000003", + "UMask": "0x2" + }, + { + "BriefDescription": "This event is deprecated. Refer to new event L1D_PEND_MISS.L2_STALLS", + "Deprecated": "1", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.L2_STALL", + "SampleAfterValue": "1000003", + "UMask": "0x4" + }, + { + "BriefDescription": "Number of cycles a demand request has waited due to L1D due to lack of L2 resources.", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.L2_STALLS", + "PublicDescription": "Counts number of cycles a demand request has waited due to L1D due to lack of L2 resources. Demand requests include cacheable/uncacheable demand load, store, lock or SW prefetch accesses.", + "SampleAfterValue": "1000003", + "UMask": "0x4" + }, + { + "BriefDescription": "Number of L1D misses that are outstanding", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.PENDING", + "PublicDescription": "Counts number of L1D misses that are outstanding in each cycle, that is each cycle the number of Fill Buffers (FB) outstanding required by Demand Reads. FB either is held by demand loads, or it is held by non-demand loads and gets hit at least once by demand. The valid outstanding interval is defined until the FB deallocation by one of the following ways: from FB allocation, if FB is allocated by demand from the demand Hit FB, if it is allocated by hardware or software prefetch. Note: In the L1D, a Demand Read contains cacheable or noncacheable demand loads, including ones causing cache-line splits and reads due to page walks resulted from any request type.", + "SampleAfterValue": "1000003", + "UMask": "0x1" + }, + { + "BriefDescription": "Cycles with L1D load Misses outstanding.", + "CounterMask": "1", + "EventCode": "0x48", + "EventName": "L1D_PEND_MISS.PENDING_CYCLES", + "PublicDescription": "Counts duration of L1D miss outstanding in cycles.", + "SampleAfterValue": "1000003", + "UMask": "0x1" + }, + { + "BriefDescription": "L2 cache lines filling L2", + "EventCode": "0x25", + "EventName": "L2_LINES_IN.ALL", + "PublicDescription": "Counts the number of L2 cache lines filling the L2. Counting does not cover rejects.", + "SampleAfterValue": "100003", + "UMask": "0x1f" + }, + { + "BriefDescription": "L2_LINES_OUT.NON_SILENT", + "EventCode": "0x26", + "EventName": "L2_LINES_OUT.NON_SILENT", + "SampleAfterValue": "200003", + "UMask": "0x2" + }, + { + "BriefDescription": "Non-modified cache lines that are silently dropped by L2 cache when triggered by an L2 cache fill.", + "EventCode": "0x26", + "EventName": "L2_LINES_OUT.SILENT", + "PublicDescription": "Counts the number of lines that are silently dropped by L2 cache when triggered by an L2 cache fill. These lines are typically in Shared or Exclusive state. A non-threaded event.", + "SampleAfterValue": "200003", + "UMask": "0x1" + }, + { + "BriefDescription": "Cache lines that have been L2 hardware prefetched but not used by demand accesses", + "EventCode": "0x26", + "EventName": "L2_LINES_OUT.USELESS_HWPF", + "PublicDescription": "Counts the number of cache lines that have been prefetched by the L2 hardware prefetcher but not used by demand access when evicted from the L2 cache", + "SampleAfterValue": "200003", + "UMask": "0x4" + }, + { + "BriefDescription": "All accesses to L2 cache [This event is alias to L2_RQSTS.REFERENCES]", + "EventCode": "0x24", + "EventName": "L2_REQUEST.ALL", + "PublicDescription": "Counts all requests that were hit or true misses in L2 cache. True-miss excludes misses that were merged with ongoing L2 misses. [This event is alias to L2_RQSTS.REFERENCES]", + "SampleAfterValue": "200003", + "UMask": "0xff" + }, + { + "BriefDescription": "Read requests with true-miss in L2 cache. [This event is alias to L2_RQSTS.MISS]", + "EventCode": "0x24", + "EventName": "L2_REQUEST.MISS", + "PublicDescription": "Counts read requests of any type with true-miss in the L2 cache. True-miss excludes L2 misses that were merged with ongoing L2 misses. [This event is alias to L2_RQSTS.MISS]", + "SampleAfterValue": "200003", + "UMask": "0x3f" + }, + { + "BriefDescription": "L2 code requests", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_CODE_RD", + "PublicDescription": "Counts the total number of L2 code requests.", + "SampleAfterValue": "200003", + "UMask": "0xe4" + }, + { + "BriefDescription": "Demand Data Read access L2 cache", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_DEMAND_DATA_RD", + "PublicDescription": "Counts Demand Data Read requests accessing the L2 cache. These requests may hit or miss L2 cache. True-miss exclude misses that were merged with ongoing L2 misses. An access is counted once.", + "SampleAfterValue": "200003", + "UMask": "0xe1" + }, + { + "BriefDescription": "Demand requests that miss L2 cache", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_DEMAND_MISS", + "PublicDescription": "Counts demand requests that miss L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0x27" + }, + { + "BriefDescription": "Demand requests to L2 cache", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_DEMAND_REFERENCES", + "PublicDescription": "Counts demand requests to L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0xe7" + }, + { + "BriefDescription": "L2_RQSTS.ALL_HWPF", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_HWPF", + "SampleAfterValue": "200003", + "UMask": "0xf0" + }, + { + "BriefDescription": "RFO requests to L2 cache", + "EventCode": "0x24", + "EventName": "L2_RQSTS.ALL_RFO", + "PublicDescription": "Counts the total number of RFO (read for ownership) requests to L2 cache. L2 RFO requests include both L1D demand RFO misses as well as L1D RFO prefetches.", + "SampleAfterValue": "200003", + "UMask": "0xe2" + }, + { + "BriefDescription": "L2 cache hits when fetching instructions, code reads.", + "EventCode": "0x24", + "EventName": "L2_RQSTS.CODE_RD_HIT", + "PublicDescription": "Counts L2 cache hits when fetching instructions, code reads.", + "SampleAfterValue": "200003", + "UMask": "0xc4" + }, + { + "BriefDescription": "L2 cache misses when fetching instructions", + "EventCode": "0x24", + "EventName": "L2_RQSTS.CODE_RD_MISS", + "PublicDescription": "Counts L2 cache misses when fetching instructions.", + "SampleAfterValue": "200003", + "UMask": "0x24" + }, + { + "BriefDescription": "Demand Data Read requests that hit L2 cache", + "EventCode": "0x24", + "EventName": "L2_RQSTS.DEMAND_DATA_RD_HIT", + "PublicDescription": "Counts the number of demand Data Read requests initiated by load instructions that hit L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0xc1" + }, + { + "BriefDescription": "Demand Data Read miss L2 cache", + "EventCode": "0x24", + "EventName": "L2_RQSTS.DEMAND_DATA_RD_MISS", + "PublicDescription": "Counts demand Data Read requests with true-miss in the L2 cache. True-miss excludes misses that were merged with ongoing L2 misses. An access is counted once.", + "SampleAfterValue": "200003", + "UMask": "0x21" + }, + { + "BriefDescription": "L2_RQSTS.HWPF_MISS", + "EventCode": "0x24", + "EventName": "L2_RQSTS.HWPF_MISS", + "SampleAfterValue": "200003", + "UMask": "0x30" + }, + { + "BriefDescription": "Read requests with true-miss in L2 cache. [This event is alias to L2_REQUEST.MISS]", + "EventCode": "0x24", + "EventName": "L2_RQSTS.MISS", + "PublicDescription": "Counts read requests of any type with true-miss in the L2 cache. True-miss excludes L2 misses that were merged with ongoing L2 misses. [This event is alias to L2_REQUEST.MISS]", + "SampleAfterValue": "200003", + "UMask": "0x3f" + }, + { + "BriefDescription": "All accesses to L2 cache [This event is alias to L2_REQUEST.ALL]", + "EventCode": "0x24", + "EventName": "L2_RQSTS.REFERENCES", + "PublicDescription": "Counts all requests that were hit or true misses in L2 cache. True-miss excludes misses that were merged with ongoing L2 misses. [This event is alias to L2_REQUEST.ALL]", + "SampleAfterValue": "200003", + "UMask": "0xff" + }, + { + "BriefDescription": "RFO requests that hit L2 cache", + "EventCode": "0x24", + "EventName": "L2_RQSTS.RFO_HIT", + "PublicDescription": "Counts the RFO (Read-for-Ownership) requests that hit L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0xc2" + }, + { + "BriefDescription": "RFO requests that miss L2 cache", + "EventCode": "0x24", + "EventName": "L2_RQSTS.RFO_MISS", + "PublicDescription": "Counts the RFO (Read-for-Ownership) requests that miss L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0x22" + }, + { + "BriefDescription": "SW prefetch requests that hit L2 cache.", + "EventCode": "0x24", + "EventName": "L2_RQSTS.SWPF_HIT", + "PublicDescription": "Counts Software prefetch requests that hit the L2 cache. Accounts for PREFETCHNTA and PREFETCHT0/1/2 instructions when FB is not full.", + "SampleAfterValue": "200003", + "UMask": "0xc8" + }, + { + "BriefDescription": "SW prefetch requests that miss L2 cache.", + "EventCode": "0x24", + "EventName": "L2_RQSTS.SWPF_MISS", + "PublicDescription": "Counts Software prefetch requests that miss the L2 cache. Accounts for PREFETCHNTA and PREFETCHT0/1/2 instructions when FB is not full.", + "SampleAfterValue": "200003", + "UMask": "0x28" + }, + { + "BriefDescription": "Core-originated cacheable requests that missed L3 (Except hardware prefetches to the L3)", + "EventCode": "0x2e", + "EventName": "LONGEST_LAT_CACHE.MISS", + "PublicDescription": "Counts core-originated cacheable requests that miss the L3 cache (Longest Latency cache). Requests include data and code reads, Reads-for-Ownership (RFOs), speculative accesses and hardware prefetches to the L1 and L2. It does not include hardware prefetches to the L3, and may not count other types of requests to the L3.", + "SampleAfterValue": "100003", + "UMask": "0x41" + }, + { + "BriefDescription": "Core-originated cacheable requests that refer to L3 (Except hardware prefetches to the L3)", + "EventCode": "0x2e", + "EventName": "LONGEST_LAT_CACHE.REFERENCE", + "PublicDescription": "Counts core-originated cacheable requests to the L3 cache (Longest Latency cache). Requests include data and code reads, Reads-for-Ownership (RFOs), speculative accesses and hardware prefetches to the L1 and L2. It does not include hardware prefetches to the L3, and may not count other types of requests to the L3.", + "SampleAfterValue": "100003", + "UMask": "0x4f" + }, + { + "BriefDescription": "Retired load instructions.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.ALL_LOADS", + "PEBS": "1", + "PublicDescription": "Counts all retired load instructions. This event accounts for SW prefetch instructions of PREFETCHNTA or PREFETCHT0/1/2 or PREFETCHW.", + "SampleAfterValue": "1000003", + "UMask": "0x81" + }, + { + "BriefDescription": "Retired store instructions.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.ALL_STORES", + "PEBS": "1", + "PublicDescription": "Counts all retired store instructions.", + "SampleAfterValue": "1000003", + "UMask": "0x82" + }, + { + "BriefDescription": "All retired memory instructions.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.ANY", + "PEBS": "1", + "PublicDescription": "Counts all retired memory instructions - loads and stores.", + "SampleAfterValue": "1000003", + "UMask": "0x83" + }, + { + "BriefDescription": "Retired load instructions with locked access.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.LOCK_LOADS", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions with locked access.", + "SampleAfterValue": "100007", + "UMask": "0x21" + }, + { + "BriefDescription": "Retired load instructions that split across a cacheline boundary.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.SPLIT_LOADS", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions that split across a cacheline boundary.", + "SampleAfterValue": "100003", + "UMask": "0x41" + }, + { + "BriefDescription": "Retired store instructions that split across a cacheline boundary.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.SPLIT_STORES", + "PEBS": "1", + "PublicDescription": "Counts retired store instructions that split across a cacheline boundary.", + "SampleAfterValue": "100003", + "UMask": "0x42" + }, + { + "BriefDescription": "Retired load instructions that miss the STLB.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.STLB_MISS_LOADS", + "PEBS": "1", + "PublicDescription": "Number of retired load instructions that (start a) miss in the 2nd-level TLB (STLB).", + "SampleAfterValue": "100003", + "UMask": "0x11" + }, + { + "BriefDescription": "Retired store instructions that miss the STLB.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_INST_RETIRED.STLB_MISS_STORES", + "PEBS": "1", + "PublicDescription": "Number of retired store instructions that (start a) miss in the 2nd-level TLB (STLB).", + "SampleAfterValue": "100003", + "UMask": "0x12" + }, + { + "BriefDescription": "Completed demand load uops that miss the L1 d-cache.", + "EventCode": "0x43", + "EventName": "MEM_LOAD_COMPLETED.L1_MISS_ANY", + "PublicDescription": "Number of completed demand load requests that missed the L1 data cache including shadow misses (FB hits, merge to an ongoing L1D miss)", + "SampleAfterValue": "1000003", + "UMask": "0xfd" + }, + { + "BriefDescription": "Retired load instructions whose data sources were HitM responses from shared L3", + "Data_LA": "1", + "EventCode": "0xd2", + "EventName": "MEM_LOAD_L3_HIT_RETIRED.XSNP_FWD", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions whose data sources were HitM responses from shared L3.", + "SampleAfterValue": "20011", + "UMask": "0x4" + }, + { + "BriefDescription": "Retired load instructions whose data sources were L3 hit and cross-core snoop missed in on-pkg core cache.", + "Data_LA": "1", + "EventCode": "0xd2", + "EventName": "MEM_LOAD_L3_HIT_RETIRED.XSNP_MISS", + "PEBS": "1", + "PublicDescription": "Counts the retired load instructions whose data sources were L3 hit and cross-core snoop missed in on-pkg core cache.", + "SampleAfterValue": "20011", + "UMask": "0x1" + }, + { + "BriefDescription": "Retired load instructions whose data sources were hits in L3 without snoops required", + "Data_LA": "1", + "EventCode": "0xd2", + "EventName": "MEM_LOAD_L3_HIT_RETIRED.XSNP_NONE", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions whose data sources were hits in L3 without snoops required.", + "SampleAfterValue": "100003", + "UMask": "0x8" + }, + { + "BriefDescription": "Retired load instructions whose data sources were L3 and cross-core snoop hits in on-pkg core cache", + "Data_LA": "1", + "EventCode": "0xd2", + "EventName": "MEM_LOAD_L3_HIT_RETIRED.XSNP_NO_FWD", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions whose data sources were L3 and cross-core snoop hits in on-pkg core cache.", + "SampleAfterValue": "20011", + "UMask": "0x2" + }, + { + "BriefDescription": "Retired load instructions which data sources missed L3 but serviced from local dram", + "Data_LA": "1", + "EventCode": "0xd3", + "EventName": "MEM_LOAD_L3_MISS_RETIRED.LOCAL_DRAM", + "PEBS": "1", + "PublicDescription": "Retired load instructions which data sources missed L3 but serviced from local DRAM.", + "SampleAfterValue": "100007", + "UMask": "0x1" + }, + { + "BriefDescription": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_DRAM", + "Data_LA": "1", + "EventCode": "0xd3", + "EventName": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_DRAM", + "PEBS": "1", + "SampleAfterValue": "1000003", + "UMask": "0x2" + }, + { + "BriefDescription": "Retired load instructions whose data sources was forwarded from a remote cache", + "Data_LA": "1", + "EventCode": "0xd3", + "EventName": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_FWD", + "PEBS": "1", + "PublicDescription": "Retired load instructions whose data sources was forwarded from a remote cache.", + "SampleAfterValue": "100007", + "UMask": "0x8" + }, + { + "BriefDescription": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_HITM", + "Data_LA": "1", + "EventCode": "0xd3", + "EventName": "MEM_LOAD_L3_MISS_RETIRED.REMOTE_HITM", + "PEBS": "1", + "SampleAfterValue": "1000003", + "UMask": "0x4" + }, + { + "BriefDescription": "Retired instructions with at least 1 uncacheable load or lock.", + "Data_LA": "1", + "EventCode": "0xd4", + "EventName": "MEM_LOAD_MISC_RETIRED.UC", + "PEBS": "1", + "PublicDescription": "Retired instructions with at least one load to uncacheable memory-type, or at least one cache-line split locked access (Bus Lock).", + "SampleAfterValue": "100007", + "UMask": "0x4" + }, + { + "BriefDescription": "Number of completed demand load requests that missed the L1, but hit the FB(fill buffer), because a preceding miss to the same cacheline initiated the line to be brought into L1, but data is not yet ready in L1.", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.FB_HIT", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions with at least one uop was load missed in L1 but hit FB (Fill Buffers) due to preceding miss to the same cache line with data not ready.", + "SampleAfterValue": "100007", + "UMask": "0x40" + }, + { + "BriefDescription": "Retired load instructions with L1 cache hits as data sources", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L1_HIT", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions with at least one uop that hit in the L1 data cache. This event includes all SW prefetches and lock instructions regardless of the data source.", + "SampleAfterValue": "1000003", + "UMask": "0x1" + }, + { + "BriefDescription": "Retired load instructions missed L1 cache as data sources", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L1_MISS", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions with at least one uop that missed in the L1 cache.", + "SampleAfterValue": "200003", + "UMask": "0x8" + }, + { + "BriefDescription": "Retired load instructions with L2 cache hits as data sources", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L2_HIT", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions with L2 cache hits as data sources.", + "SampleAfterValue": "200003", + "UMask": "0x2" + }, + { + "BriefDescription": "Retired load instructions missed L2 cache as data sources", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L2_MISS", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions missed L2 cache as data sources.", + "SampleAfterValue": "100021", + "UMask": "0x10" + }, + { + "BriefDescription": "Retired load instructions with L3 cache hits as data sources", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L3_HIT", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions with at least one uop that hit in the L3 cache.", + "SampleAfterValue": "100021", + "UMask": "0x4" + }, + { + "BriefDescription": "Retired load instructions missed L3 cache as data sources", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_RETIRED.L3_MISS", + "PEBS": "1", + "PublicDescription": "Counts retired load instructions with at least one uop that missed in the L3 cache.", + "SampleAfterValue": "50021", + "UMask": "0x20" + }, + { + "BriefDescription": "MEM_STORE_RETIRED.L2_HIT", + "EventCode": "0x44", + "EventName": "MEM_STORE_RETIRED.L2_HIT", + "SampleAfterValue": "200003", + "UMask": "0x1" + }, + { + "BriefDescription": "Retired memory uops for any access", + "EventCode": "0xe5", + "EventName": "MEM_UOP_RETIRED.ANY", + "PublicDescription": "Number of retired micro-operations (uops) for load or store memory accesses", + "SampleAfterValue": "1000003", + "UMask": "0x3" + }, + { + "BriefDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that hit in the L3 or were snooped from another core's caches on the same socket.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_CODE_RD.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F803C0004", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that resulted in a snoop hit a modified line in another core's caches which forwarded the data.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_CODE_RD.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C0004", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that hit a modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_CODE_RD.SNC_CACHE.HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1008000004", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand instruction fetches and L1 instruction cache prefetches that either hit a non-modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_CODE_RD.SNC_CACHE.HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x808000004", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that hit in the L3 or were snooped from another core's caches on the same socket.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F803C0001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that resulted in a snoop hit a modified line in another core's caches which forwarded the data.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C0001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that resulted in a snoop that hit in another core, which did not forward the data.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HIT_NO_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x4003C0001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that resulted in a snoop hit in another core's caches which forwarded the unmodified data to the requesting core.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x8003C0001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by a cache on a remote socket where a snoop hit a modified line in another core's caches which forwarded the data.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.REMOTE_CACHE.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1030000001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by a cache on a remote socket where a snoop hit in another core's caches which forwarded the unmodified data to the requesting core.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.REMOTE_CACHE.SNOOP_HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x830000001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that hit a modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.SNC_CACHE.HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1008000001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that either hit a non-modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_DATA_RD.SNC_CACHE.HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x808000001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that hit in the L3 or were snooped from another core's caches on the same socket.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F803C0002", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that resulted in a snoop hit a modified line in another core's caches which forwarded the data.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C0002", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that hit a modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.SNC_CACHE.HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1008000002", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) requests and software prefetches for exclusive ownership (PREFETCHW) that either hit a non-modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.DEMAND_RFO.SNC_CACHE.HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x808000002", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts hardware prefetches to the L3 only that hit in the L3 or were snooped from another core's caches on the same socket.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.HWPF_L3.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x80082380", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that hit in the L3 or were snooped from another core's caches on the same socket.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F003C4477", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that resulted in a snoop hit a modified line in another core's caches which forwarded the data.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C4477", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that resulted in a snoop that hit in another core, which did not forward the data.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.L3_HIT.SNOOP_HIT_NO_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x4003C4477", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that resulted in a snoop hit in another core's caches which forwarded the unmodified data to the requesting core.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.L3_HIT.SNOOP_HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x8003C4477", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that were supplied by a cache on a remote socket where a snoop was sent and data was returned (Modified or Not Modified).", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.REMOTE_CACHE.SNOOP_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1830004477", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that were supplied by a cache on a remote socket where a snoop hit a modified line in another core's caches which forwarded the data.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.REMOTE_CACHE.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1030004477", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that were supplied by a cache on a remote socket where a snoop hit in another core's caches which forwarded the unmodified data to the requesting core.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.REMOTE_CACHE.SNOOP_HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x830004477", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that hit a modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.SNC_CACHE.HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1008004477", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all (cacheable) data read, code read and RFO requests including demands and prefetches to the core caches (L1 or L2) that either hit a non-modified line in a distant L3 Cache or were snooped from a distant core's L1/L2 caches on this socket when the system is in SNC (sub-NUMA cluster) mode.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.READS_TO_CORE.SNC_CACHE.HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x808004477", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO), hardware prefetch RFOs (which bring data to L2), and software prefetches for exclusive ownership (PREFETCHW) that hit to a (M)odified cacheline in the L3 or snoop filter.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.RFO_TO_CORE.L3_HIT_M", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x1F80040022", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts streaming stores that hit in the L3 or were snooped from another core's caches on the same socket.", + "EventCode": "0x2A,0x2B", + "EventName": "OCR.STREAMING_WR.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x80080800", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "OFFCORE_REQUESTS.ALL_REQUESTS", + "EventCode": "0x21", + "EventName": "OFFCORE_REQUESTS.ALL_REQUESTS", + "SampleAfterValue": "100003", + "UMask": "0x80" + }, + { + "BriefDescription": "Demand and prefetch data reads", + "EventCode": "0x21", + "EventName": "OFFCORE_REQUESTS.DATA_RD", + "PublicDescription": "Counts the demand and prefetch data reads. All Core Data Reads include cacheable 'Demands' and L2 prefetchers (not L3 prefetchers). Counting also covers reads due to page walks resulted from any request type.", + "SampleAfterValue": "100003", + "UMask": "0x8" + }, + { + "BriefDescription": "Demand Data Read requests sent to uncore", + "EventCode": "0x21", + "EventName": "OFFCORE_REQUESTS.DEMAND_DATA_RD", + "PublicDescription": "Counts the Demand Data Read requests sent to uncore. Use it in conjunction with OFFCORE_REQUESTS_OUTSTANDING to determine average latency in the uncore.", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "This event is deprecated. Refer to new event OFFCORE_REQUESTS_OUTSTANDING.DATA_RD", + "Deprecated": "1", + "EventCode": "0x20", + "EventName": "OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD", + "SampleAfterValue": "1000003", + "UMask": "0x8" + }, + { + "BriefDescription": "OFFCORE_REQUESTS_OUTSTANDING.CYCLES_WITH_DATA_RD", + "CounterMask": "1", + "EventCode": "0x20", + "EventName": "OFFCORE_REQUESTS_OUTSTANDING.CYCLES_WITH_DATA_RD", + "SampleAfterValue": "1000003", + "UMask": "0x8" + }, + { + "BriefDescription": "Cycles where at least 1 outstanding demand data read request is pending.", + "CounterMask": "1", + "EventCode": "0x20", + "EventName": "OFFCORE_REQUESTS_OUTSTANDING.CYCLES_WITH_DEMAND_DATA_RD", + "SampleAfterValue": "2000003", + "UMask": "0x1" + }, + { + "BriefDescription": "OFFCORE_REQUESTS_OUTSTANDING.CYCLES_WITH_DEMAND_RFO", + "CounterMask": "1", + "EventCode": "0x20", + "EventName": "OFFCORE_REQUESTS_OUTSTANDING.CYCLES_WITH_DEMAND_RFO", + "SampleAfterValue": "1000003", + "UMask": "0x4" + }, + { + "BriefDescription": "OFFCORE_REQUESTS_OUTSTANDING.DATA_RD", + "EventCode": "0x20", + "EventName": "OFFCORE_REQUESTS_OUTSTANDING.DATA_RD", + "SampleAfterValue": "1000003", + "UMask": "0x8" + }, + { + "BriefDescription": "For every cycle, increments by the number of outstanding demand data read requests pending.", + "EventCode": "0x20", + "EventName": "OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD", + "PublicDescription": "For every cycle, increments by the number of outstanding demand data read requests pending. Requests are considered outstanding from the time they miss the core's L2 cache until the transaction completion message is sent to the requestor.", + "SampleAfterValue": "1000003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts bus locks, accounts for cache line split locks and UC locks.", + "EventCode": "0x2c", + "EventName": "SQ_MISC.BUS_LOCK", + "PublicDescription": "Counts the more expensive bus lock needed to enforce cache coherency for certain memory accesses that need to be done atomically. Can be created by issuing an atomic instruction (via the LOCK prefix) which causes a cache line split or accesses uncacheable memory.", + "SampleAfterValue": "100003", + "UMask": "0x10" + }, + { + "BriefDescription": "Number of PREFETCHNTA instructions executed.", + "EventCode": "0x40", + "EventName": "SW_PREFETCH_ACCESS.NTA", + "PublicDescription": "Counts the number of PREFETCHNTA instructions executed.", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Number of PREFETCHW instructions executed.", + "EventCode": "0x40", + "EventName": "SW_PREFETCH_ACCESS.PREFETCHW", + "PublicDescription": "Counts the number of PREFETCHW instructions executed.", + "SampleAfterValue": "100003", + "UMask": "0x8" + }, + { + "BriefDescription": "Number of PREFETCHT0 instructions executed.", + "EventCode": "0x40", + "EventName": "SW_PREFETCH_ACCESS.T0", + "PublicDescription": "Counts the number of PREFETCHT0 instructions executed.", + "SampleAfterValue": "100003", + "UMask": "0x2" + }, + { + "BriefDescription": "Number of PREFETCHT1 or PREFETCHT2 instructions executed.", + "EventCode": "0x40", + "EventName": "SW_PREFETCH_ACCESS.T1_T2", + "PublicDescription": "Counts the number of PREFETCHT1 or PREFETCHT2 instructions executed.", + "SampleAfterValue": "100003", + "UMask": "0x4" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/emeraldrapids/floating-point.json b/lib/libpmc/pmu-events/arch/x86/emeraldrapids/floating-point.json new file mode 100644 index 000000000000..1bdefaf96287 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/emeraldrapids/floating-point.json @@ -0,0 +1,214 @@ +[ + { + "BriefDescription": "ARITH.FPDIV_ACTIVE", + "CounterMask": "1", + "EventCode": "0xb0", + "EventName": "ARITH.FPDIV_ACTIVE", + "SampleAfterValue": "1000003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts all microcode FP assists.", + "EventCode": "0xc1", + "EventName": "ASSISTS.FP", + "PublicDescription": "Counts all microcode Floating Point assists.", + "SampleAfterValue": "100003", + "UMask": "0x2" + }, + { + "BriefDescription": "ASSISTS.SSE_AVX_MIX", + "EventCode": "0xc1", + "EventName": "ASSISTS.SSE_AVX_MIX", + "SampleAfterValue": "1000003", + "UMask": "0x10" + }, + { + "BriefDescription": "FP_ARITH_DISPATCHED.PORT_0 [This event is alias to FP_ARITH_DISPATCHED.V0]", + "EventCode": "0xb3", + "EventName": "FP_ARITH_DISPATCHED.PORT_0", + "SampleAfterValue": "2000003", + "UMask": "0x1" + }, + { + "BriefDescription": "FP_ARITH_DISPATCHED.PORT_1 [This event is alias to FP_ARITH_DISPATCHED.V1]", + "EventCode": "0xb3", + "EventName": "FP_ARITH_DISPATCHED.PORT_1", + "SampleAfterValue": "2000003", + "UMask": "0x2" + }, + { + "BriefDescription": "FP_ARITH_DISPATCHED.PORT_5 [This event is alias to FP_ARITH_DISPATCHED.V2]", + "EventCode": "0xb3", + "EventName": "FP_ARITH_DISPATCHED.PORT_5", + "SampleAfterValue": "2000003", + "UMask": "0x4" + }, + { + "BriefDescription": "FP_ARITH_DISPATCHED.V0 [This event is alias to FP_ARITH_DISPATCHED.PORT_0]", + "EventCode": "0xb3", *** 22465 LINES SKIPPED *** From nobody Thu Dec 4 18:02:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMj5C1nMgz6JjMm for ; Thu, 04 Dec 2025 18:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMj5C0T0hz3bRX for ; Thu, 04 Dec 2025 18:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764871327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6xD2ZJoh93aZGp9YCqWQgpJTAity9z3bjswcv+ZIVKs=; b=fnZX6Tsk8ikB5WUiA0NlkoDd65bnxug1D0lA+KG68ngn5KqJbLO+yJECwPHm42UcLuAVOG UDL06siWI9kL6F2KM0LQjBF4bRxQTXUX2ickvWr1HUj6bEyfCxKpkV7looSgHJRFj8ka67 8rpv7lbtBqGcg6HqoBO6kJa83CwQljBNQ8JLtypqXuQ1Go43zhvzCWHJeoDJYDXK7DeQrh CwJwRhf7/Tm5eTolX5YK7ICIbwFoFT/3gHIqjoR9q4n2k38ImuveVpD7f8SOR1CgmdHEOb EvQdif01vxghY4WZg/a6jiAI7I4uUKuudInjUiJNtaZZQsPqTQyiUrkd2lbIvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764871327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6xD2ZJoh93aZGp9YCqWQgpJTAity9z3bjswcv+ZIVKs=; b=jfvSa4mfR6ZuZY1KCfBfnkroPxM3eQobIAP5Iie8K9g+HuKfy5fCIjJCBXGf2wNLBK8Qa2 PejDtSjCIoT2nSwQhA5QMDgS81bBn6I8SFMRf1R7FJr5ZcOVY0G9IqIsii/72iCbgU+I60 3ItPhNVkgbqvW0zay/9sJWUdUsgqjefjXlfJkpkSrnwQo4oQODPqGfdcmv6YflAUazkCVY Ktrs+hPe6rx04eeCo69JfBTJ7lcimY9QIfKxW70goz08FEHocXwU0PByS3l8ZdD7O1Q2Cz R/zs/v062hull1SHLietE8mYtZLxqD5gz0E+ajsJRPdfqh6b9Ztlq9/CpW5BjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764871327; a=rsa-sha256; cv=none; b=hB772Cq6nJg2NLj8vntORfk4gej5LLsWXL5yokrLruMfh4+uBkD/wUh7gUineJSEVq0dMf Jtjytu/FD4PJ0720CuwbOj+Rr4wKz63p9K9fTm3bpv5oO7l6jn2yQ6hgRRcYW4tXqKpN5L c4rRcXWrXJaqMvwV/PW/Hy2jOx4+r4R/5GPII5aP2tWNpyaYRlCiRcW3dWbCG1fu/iC+2M HHCzjbs/T9Nekc2c11QHpJdQXl5nKtG11IoJA36RmRaMolUyB/3cZ6kWcJSqFsJWRD2MPe r+h47f2Y9MBcr5ax7cJW/Mb8sfQVknot4qg/0CPxmnk3b/dWxnP2dQs41tlFQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMj5B758szb2c for ; Thu, 04 Dec 2025 18:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8cbf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 18:02:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: =?utf-8?Q?Ana=C3=ABll?=e CAZUC From: Mitchell Horne Subject: git: ca3e47b0ea68 - main - pmc: add alderlaken model List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ca3e47b0ea68664c7e10e1c3e28c5ac7d9932c21 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 18:02:06 +0000 Message-Id: <6931cc9e.8cbf.1777a783@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ca3e47b0ea68664c7e10e1c3e28c5ac7d9932c21 commit ca3e47b0ea68664c7e10e1c3e28c5ac7d9932c21 Author: Anaëlle CAZUC AuthorDate: 2025-12-04 17:52:23 +0000 Commit: Mitchell Horne CommitDate: 2025-12-04 18:01:05 +0000 pmc: add alderlaken model This commit adds alderlaken CPU model to hwpmc/libpmc. JSON event definitions are imported from Intel perfmon version 1.16. Reviewed by: mhorne MFC after: 1 week Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D49229 --- .../arch/x86/alderlaken/adln-metrics.json | 583 +++++++++++++++++++++ .../pmu-events/arch/x86/alderlaken/cache.json | 330 ++++++++++++ .../arch/x86/alderlaken/floating-point.json | 18 + .../pmu-events/arch/x86/alderlaken/frontend.json | 26 + .../pmu-events/arch/x86/alderlaken/memory.json | 81 +++ .../pmu-events/arch/x86/alderlaken/other.json | 38 ++ .../pmu-events/arch/x86/alderlaken/pipeline.json | 533 +++++++++++++++++++ .../arch/x86/alderlaken/uncore-memory.json | 175 +++++++ .../arch/x86/alderlaken/uncore-other.json | 33 ++ .../arch/x86/alderlaken/virtual-memory.json | 47 ++ lib/libpmc/pmu-events/arch/x86/mapfile.csv | 1 + sys/dev/hwpmc/hwpmc_intel.c | 4 + sys/sys/pmc.h | 1 + 13 files changed, 1870 insertions(+) diff --git a/lib/libpmc/pmu-events/arch/x86/alderlaken/adln-metrics.json b/lib/libpmc/pmu-events/arch/x86/alderlaken/adln-metrics.json new file mode 100644 index 000000000000..535acee4ab7f --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/alderlaken/adln-metrics.json @@ -0,0 +1,583 @@ +[ + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to frontend stalls.", + "MetricExpr": "TOPDOWN_FE_BOUND.ALL / SLOTS", + "MetricGroup": "TopdownL1", + "MetricName": "tma_frontend_bound", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to frontend bandwidth restrictions due to decode, predecode, cisc, and other limitations.", + "MetricExpr": "TOPDOWN_FE_BOUND.FRONTEND_LATENCY / SLOTS", + "MetricGroup": "TopdownL2;tma_frontend_bound_group", + "MetricName": "tma_frontend_latency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to instruction cache misses.", + "MetricExpr": "TOPDOWN_FE_BOUND.ICACHE / SLOTS", + "MetricGroup": "TopdownL3;tma_frontend_latency_group", + "MetricName": "tma_icache", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to Instruction Table Lookaside Buffer (ITLB) misses.", + "MetricExpr": "TOPDOWN_FE_BOUND.ITLB / SLOTS", + "MetricGroup": "TopdownL3;tma_frontend_latency_group", + "MetricName": "tma_itlb", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to BACLEARS, which occurs when the Branch Target Buffer (BTB) prediction or lack thereof, was corrected by a later branch predictor in the frontend", + "MetricExpr": "TOPDOWN_FE_BOUND.BRANCH_DETECT / SLOTS", + "MetricGroup": "TopdownL3;tma_frontend_latency_group", + "MetricName": "tma_branch_detect", + "PublicDescription": "Counts the number of issue slots that were not delivered by the frontend due to BACLEARS, which occurs when the Branch Target Buffer (BTB) prediction or lack thereof, was corrected by a later branch predictor in the frontend. Includes BACLEARS due to all branch types including conditional and unconditional jumps, returns, and indirect branches.", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to BTCLEARS, which occurs when the Branch Target Buffer (BTB) predicts a taken branch.", + "MetricExpr": "TOPDOWN_FE_BOUND.BRANCH_RESTEER / SLOTS", + "MetricGroup": "TopdownL3;tma_frontend_latency_group", + "MetricName": "tma_branch_resteer", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to frontend bandwidth restrictions due to decode, predecode, cisc, and other limitations.", + "MetricExpr": "TOPDOWN_FE_BOUND.FRONTEND_BANDWIDTH / SLOTS", + "MetricGroup": "TopdownL2;tma_frontend_bound_group", + "MetricName": "tma_frontend_bandwidth", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to the microcode sequencer (MS).", + "MetricExpr": "TOPDOWN_FE_BOUND.CISC / SLOTS", + "MetricGroup": "TopdownL3;tma_frontend_bandwidth_group", + "MetricName": "tma_cisc", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to decode stalls.", + "MetricExpr": "TOPDOWN_FE_BOUND.DECODE / SLOTS", + "MetricGroup": "TopdownL3;tma_frontend_bandwidth_group", + "MetricName": "tma_decode", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to wrong predecodes.", + "MetricExpr": "TOPDOWN_FE_BOUND.PREDECODE / SLOTS", + "MetricGroup": "TopdownL3;tma_frontend_bandwidth_group", + "MetricName": "tma_predecode", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not delivered by the frontend due to other common frontend stalls not categorized.", + "MetricExpr": "TOPDOWN_FE_BOUND.OTHER / SLOTS", + "MetricGroup": "TopdownL3;tma_frontend_bandwidth_group", + "MetricName": "tma_other_fb", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the total number of issue slots that were not consumed by the backend because allocation is stalled due to a mispredicted jump or a machine clear", + "MetricExpr": "(SLOTS - (TOPDOWN_FE_BOUND.ALL + TOPDOWN_BE_BOUND.ALL + TOPDOWN_RETIRING.ALL)) / SLOTS", + "MetricGroup": "TopdownL1", + "MetricName": "tma_bad_speculation", + "PublicDescription": "Counts the total number of issue slots that were not consumed by the backend because allocation is stalled due to a mispredicted jump or a machine clear. Only issue slots wasted due to fast nukes such as memory ordering nukes are counted. Other nukes are not accounted for. Counts all issue slots blocked during this recovery window including relevant microcode flows and while uops are not yet available in the instruction queue (IQ). Also includes the issue slots that were consumed by the backend but were thrown away because they were younger than the mispredict or machine clear.", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to branch mispredicts.", + "MetricExpr": "TOPDOWN_BAD_SPECULATION.MISPREDICT / SLOTS", + "MetricGroup": "TopdownL2;tma_bad_speculation_group", + "MetricName": "tma_branch_mispredicts", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the total number of issue slots that were not consumed by the backend because allocation is stalled due to a machine clear (nuke) of any kind including memory ordering and memory disambiguation.", + "MetricExpr": "TOPDOWN_BAD_SPECULATION.MACHINE_CLEARS / SLOTS", + "MetricGroup": "TopdownL2;tma_bad_speculation_group", + "MetricName": "tma_machine_clears", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to a machine clear (slow nuke).", + "MetricExpr": "TOPDOWN_BAD_SPECULATION.NUKE / SLOTS", + "MetricGroup": "TopdownL3;tma_machine_clears_group", + "MetricName": "tma_nuke", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of machine clears relative to the number of nuke slots due to SMC. ", + "MetricExpr": "tma_nuke * (MACHINE_CLEARS.SMC / MACHINE_CLEARS.SLOW)", + "MetricGroup": "TopdownL4;tma_nuke_group", + "MetricName": "tma_smc", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of machine clears relative to the number of nuke slots due to memory ordering. ", + "MetricExpr": "tma_nuke * (MACHINE_CLEARS.MEMORY_ORDERING / MACHINE_CLEARS.SLOW)", + "MetricGroup": "TopdownL4;tma_nuke_group", + "MetricName": "tma_memory_ordering", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of machine clears relative to the number of nuke slots due to FP assists. ", + "MetricExpr": "tma_nuke * (MACHINE_CLEARS.FP_ASSIST / MACHINE_CLEARS.SLOW)", + "MetricGroup": "TopdownL4;tma_nuke_group", + "MetricName": "tma_fp_assist", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of machine clears relative to the number of nuke slots due to memory disambiguation. ", + "MetricExpr": "tma_nuke * (MACHINE_CLEARS.DISAMBIGUATION / MACHINE_CLEARS.SLOW)", + "MetricGroup": "TopdownL4;tma_nuke_group", + "MetricName": "tma_disambiguation", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of machine clears relative to the number of nuke slots due to page faults. ", + "MetricExpr": "tma_nuke * (MACHINE_CLEARS.PAGE_FAULT / MACHINE_CLEARS.SLOW)", + "MetricGroup": "TopdownL4;tma_nuke_group", + "MetricName": "tma_page_fault", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to a machine clear classified as a fast nuke due to memory ordering, memory disambiguation and memory renaming.", + "MetricExpr": "TOPDOWN_BAD_SPECULATION.FASTNUKE / SLOTS", + "MetricGroup": "TopdownL3;tma_machine_clears_group", + "MetricName": "tma_fast_nuke", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the total number of issue slots that were not consumed by the backend due to backend stalls", + "MetricExpr": "TOPDOWN_BE_BOUND.ALL / SLOTS", + "MetricGroup": "TopdownL1", + "MetricName": "tma_backend_bound", + "PublicDescription": "Counts the total number of issue slots that were not consumed by the backend due to backend stalls. Note that uops must be available for consumption in order for this event to count. If a uop is not available (IQ is empty), this event will not count. The rest of these subevents count backend stalls, in cycles, due to an outstanding request which is memory bound vs core bound. The subevents are not slot based events and therefore can not be precisely added or subtracted from the Backend_Bound_Aux subevents which are slot based.", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles due to backend bound stalls that are core execution bound and not attributed to outstanding demand load or store stalls. ", + "MetricExpr": "max(0, tma_backend_bound - tma_load_store_bound)", + "MetricGroup": "TopdownL2;tma_backend_bound_group", + "MetricName": "tma_core_bound", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to stores or loads. ", + "MetricExpr": "min((TOPDOWN_BE_BOUND.ALL / SLOTS), (LD_HEAD.ANY_AT_RET / CLKS) + tma_store_bound)", + "MetricGroup": "TopdownL2;tma_backend_bound_group", + "MetricName": "tma_load_store_bound", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to store buffer full.", + "MetricExpr": "tma_mem_scheduler * (MEM_SCHEDULER_BLOCK.ST_BUF / MEM_SCHEDULER_BLOCK.ALL)", + "MetricGroup": "TopdownL3;tma_load_store_bound_group", + "MetricName": "tma_store_bound", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles that the oldest load of the load buffer is stalled at retirement due to a load block.", + "MetricExpr": "LD_HEAD.L1_BOUND_AT_RET / CLKS", + "MetricGroup": "TopdownL3;tma_load_store_bound_group", + "MetricName": "tma_l1_bound", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles that the oldest load of the load buffer is stalled at retirement due to a store forward block.", + "MetricExpr": "LD_HEAD.ST_ADDR_AT_RET / CLKS", + "MetricGroup": "TopdownL4;tma_l1_bound_group", + "MetricName": "tma_store_fwd", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles that the oldest load of the load buffer is stalled at retirement due to a first level TLB miss.", + "MetricExpr": "LD_HEAD.DTLB_MISS_AT_RET / CLKS", + "MetricGroup": "TopdownL4;tma_l1_bound_group", + "MetricName": "tma_stlb_hit", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles that the oldest load of the load buffer is stalled at retirement due to a second level TLB miss requiring a page walk.", + "MetricExpr": "LD_HEAD.PGWALK_AT_RET / CLKS", + "MetricGroup": "TopdownL4;tma_l1_bound_group", + "MetricName": "tma_stlb_miss", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles that the oldest load of the load buffer is stalled at retirement due to a number of other load blocks.", + "MetricExpr": "LD_HEAD.OTHER_AT_RET / CLKS", + "MetricGroup": "TopdownL4;tma_l1_bound_group", + "MetricName": "tma_other_l1", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles a core is stalled due to a demand load which hit in the L2 Cache.", + "MetricExpr": "(MEM_BOUND_STALLS.LOAD_L2_HIT / CLKS) - (MEM_BOUND_STALLS_AT_RET_CORRECTION * MEM_BOUND_STALLS.LOAD_L2_HIT / MEM_BOUND_STALLS.LOAD)", + "MetricGroup": "TopdownL3;tma_load_store_bound_group", + "MetricName": "tma_l2_bound", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles a core is stalled due to a demand load which hit in the Last Level Cache (LLC) or other core with HITE/F/M.", + "MetricExpr": "(MEM_BOUND_STALLS.LOAD_LLC_HIT / CLKS) - (MEM_BOUND_STALLS_AT_RET_CORRECTION * MEM_BOUND_STALLS.LOAD_LLC_HIT / MEM_BOUND_STALLS.LOAD)", + "MetricGroup": "TopdownL3;tma_load_store_bound_group", + "MetricName": "tma_l3_bound", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to a demand load miss which hit in DRAM or MMIO (Non-DRAM).", + "MetricExpr": "(MEM_BOUND_STALLS.LOAD_DRAM_HIT / CLKS) - (MEM_BOUND_STALLS_AT_RET_CORRECTION * MEM_BOUND_STALLS.LOAD_DRAM_HIT / MEM_BOUND_STALLS.LOAD)", + "MetricGroup": "TopdownL3;tma_load_store_bound_group", + "MetricName": "tma_dram_bound", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to a demand load miss which hits in the L2, LLC, DRAM or MMIO (Non-DRAM) but could not be correctly attributed or cycles in which the load miss is waiting on a request buffer.", + "MetricExpr": "max(0, tma_load_store_bound - (tma_store_bound + tma_l1_bound + tma_l2_bound + tma_l3_bound + tma_dram_bound))", + "MetricGroup": "TopdownL3;tma_load_store_bound_group", + "MetricName": "tma_other_load_store", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the total number of issue slots that were not consumed by the backend due to backend stalls", + "MetricExpr": "tma_backend_bound", + "MetricGroup": "TopdownL1", + "MetricName": "tma_backend_bound_aux", + "PublicDescription": "Counts the total number of issue slots that were not consumed by the backend due to backend stalls. Note that UOPS must be available for consumption in order for this event to count. If a uop is not available (IQ is empty), this event will not count. All of these subevents count backend stalls, in slots, due to a resource limitation. These are not cycle based events and therefore can not be precisely added or subtracted from the Backend_Bound subevents which are cycle based. These subevents are supplementary to Backend_Bound and can be used to analyze results from a resource perspective at allocation. ", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the total number of issue slots that were not consumed by the backend due to backend stalls", + "MetricExpr": "tma_backend_bound", + "MetricGroup": "TopdownL2;tma_backend_bound_aux_group", + "MetricName": "tma_resource_bound", + "PublicDescription": "Counts the total number of issue slots that were not consumed by the backend due to backend stalls. Note that uops must be available for consumption in order for this event to count. If a uop is not available (IQ is empty), this event will not count. ", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to memory reservation stalls in which a scheduler is not able to accept uops.", + "MetricExpr": "TOPDOWN_BE_BOUND.MEM_SCHEDULER / SLOTS", + "MetricGroup": "TopdownL3;tma_resource_bound_group", + "MetricName": "tma_mem_scheduler", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles, relative to the number of mem_scheduler slots, in which uops are blocked due to store buffer full", + "MetricExpr": "tma_mem_scheduler * (MEM_SCHEDULER_BLOCK.ST_BUF / MEM_SCHEDULER_BLOCK.ALL)", + "MetricGroup": "TopdownL4;tma_mem_scheduler_group", + "MetricName": "tma_st_buffer", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles, relative to the number of mem_scheduler slots, in which uops are blocked due to load buffer full", + "MetricExpr": "tma_mem_scheduler * MEM_SCHEDULER_BLOCK.LD_BUF / MEM_SCHEDULER_BLOCK.ALL", + "MetricGroup": "TopdownL4;tma_mem_scheduler_group", + "MetricName": "tma_ld_buffer", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of cycles, relative to the number of mem_scheduler slots, in which uops are blocked due to RSV full relative ", + "MetricExpr": "tma_mem_scheduler * MEM_SCHEDULER_BLOCK.RSV / MEM_SCHEDULER_BLOCK.ALL", + "MetricGroup": "TopdownL4;tma_mem_scheduler_group", + "MetricName": "tma_rsv", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to IEC or FPC RAT stalls, which can be due to FIQ or IEC reservation stalls in which the integer, floating point or SIMD scheduler is not able to accept uops.", + "MetricExpr": "TOPDOWN_BE_BOUND.NON_MEM_SCHEDULER / SLOTS", + "MetricGroup": "TopdownL3;tma_resource_bound_group", + "MetricName": "tma_non_mem_scheduler", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to the physical register file unable to accept an entry (marble stalls).", + "MetricExpr": "TOPDOWN_BE_BOUND.REGISTER / SLOTS", + "MetricGroup": "TopdownL3;tma_resource_bound_group", + "MetricName": "tma_register", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to the reorder buffer being full (ROB stalls).", + "MetricExpr": "TOPDOWN_BE_BOUND.REORDER_BUFFER / SLOTS", + "MetricGroup": "TopdownL3;tma_resource_bound_group", + "MetricName": "tma_reorder_buffer", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to certain allocation restrictions.", + "MetricExpr": "TOPDOWN_BE_BOUND.ALLOC_RESTRICTIONS / SLOTS", + "MetricGroup": "TopdownL3;tma_resource_bound_group", + "MetricName": "tma_alloc_restriction", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of issue slots that were not consumed by the backend due to scoreboards from the instruction queue (IQ), jump execution unit (JEU), or microcode sequencer (MS).", + "MetricExpr": "TOPDOWN_BE_BOUND.SERIALIZATION / SLOTS", + "MetricGroup": "TopdownL3;tma_resource_bound_group", + "MetricName": "tma_serialization", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the numer of issue slots that result in retirement slots. ", + "MetricExpr": "TOPDOWN_RETIRING.ALL / SLOTS", + "MetricGroup": "TopdownL1", + "MetricName": "tma_retiring", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of uops that are not from the microsequencer. ", + "MetricExpr": "(TOPDOWN_RETIRING.ALL - UOPS_RETIRED.MS) / SLOTS", + "MetricGroup": "TopdownL2;tma_retiring_group", + "MetricName": "tma_base", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of floating point operations per uop with all default weighting.", + "MetricExpr": "UOPS_RETIRED.FPDIV / SLOTS", + "MetricGroup": "TopdownL3;tma_base_group", + "MetricName": "tma_fp_uops", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of uops retired excluding ms and fp div uops.", + "MetricExpr": "(TOPDOWN_RETIRING.ALL - UOPS_RETIRED.MS - UOPS_RETIRED.FPDIV) / SLOTS", + "MetricGroup": "TopdownL3;tma_base_group", + "MetricName": "tma_other_ret", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "Counts the number of uops that are from the complex flows issued by the micro-sequencer (MS)", + "MetricExpr": "UOPS_RETIRED.MS / SLOTS", + "MetricGroup": "TopdownL2;tma_retiring_group", + "MetricName": "tma_ms_uops", + "PublicDescription": "Counts the number of uops that are from the complex flows issued by the micro-sequencer (MS). This includes uops from flows due to complex instructions, faults, assists, and inserted flows.", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "", + "MetricExpr": "CPU_CLK_UNHALTED.CORE", + "MetricName": "CLKS" + }, + { + "BriefDescription": "", + "MetricExpr": "CPU_CLK_UNHALTED.CORE_P", + "MetricName": "CLKS_P" + }, + { + "BriefDescription": "", + "MetricExpr": "5 * CLKS", + "MetricName": "SLOTS" + }, + { + "BriefDescription": "Instructions Per Cycle", + "MetricExpr": "INST_RETIRED.ANY / CLKS", + "MetricName": "IPC" + }, + { + "BriefDescription": "Cycles Per Instruction", + "MetricExpr": "CLKS / INST_RETIRED.ANY", + "MetricName": "CPI" + }, + { + "BriefDescription": "Uops Per Instruction", + "MetricExpr": "UOPS_RETIRED.ALL / INST_RETIRED.ANY", + "MetricName": "UPI" + }, + { + "BriefDescription": "Percentage of total non-speculative loads with a store forward or unknown store address block", + "MetricExpr": "100 * LD_BLOCKS.DATA_UNKNOWN / MEM_UOPS_RETIRED.ALL_LOADS", + "MetricName": "Store_Fwd_Blocks" + }, + { + "BriefDescription": "Percentage of total non-speculative loads with a address aliasing block", + "MetricExpr": "100 * LD_BLOCKS.4K_ALIAS / MEM_UOPS_RETIRED.ALL_LOADS", + "MetricName": "Address_Alias_Blocks" + }, + { + "BriefDescription": "Percentage of total non-speculative loads that are splits", + "MetricExpr": "100 * MEM_UOPS_RETIRED.SPLIT_LOADS / MEM_UOPS_RETIRED.ALL_LOADS", + "MetricName": "Load_Splits" + }, + { + "BriefDescription": "Instructions per Branch (lower number means higher occurance rate)", + "MetricExpr": "INST_RETIRED.ANY / BR_INST_RETIRED.ALL_BRANCHES", + "MetricName": "IpBranch" + }, + { + "BriefDescription": "Instruction per (near) call (lower number means higher occurance rate)", + "MetricExpr": "INST_RETIRED.ANY / BR_INST_RETIRED.CALL", + "MetricName": "IpCall" + }, + { + "BriefDescription": "Instructions per Load", + "MetricExpr": "INST_RETIRED.ANY / MEM_UOPS_RETIRED.ALL_LOADS", + "MetricName": "IpLoad" + }, + { + "BriefDescription": "Instructions per Store", + "MetricExpr": "INST_RETIRED.ANY / MEM_UOPS_RETIRED.ALL_STORES", + "MetricName": "IpStore" + }, + { + "BriefDescription": "Number of Instructions per non-speculative Branch Misprediction", + "MetricExpr": "INST_RETIRED.ANY / BR_MISP_RETIRED.ALL_BRANCHES", + "MetricName": "IpMispredict" + }, + { + "BriefDescription": "Instructions per Far Branch", + "MetricExpr": "INST_RETIRED.ANY / (BR_INST_RETIRED.FAR_BRANCH / 2)", + "MetricName": "IpFarBranch" + }, + { + "BriefDescription": "Ratio of all branches which mispredict", + "MetricExpr": "BR_MISP_RETIRED.ALL_BRANCHES / BR_INST_RETIRED.ALL_BRANCHES", + "MetricName": "Branch_Mispredict_Ratio" + }, + { + "BriefDescription": "Ratio between Mispredicted branches and unknown branches", + "MetricExpr": "BR_MISP_RETIRED.ALL_BRANCHES / BACLEARS.ANY", + "MetricName": "Branch_Mispredict_to_Unknown_Branch_Ratio" + }, + { + "BriefDescription": "Percentage of all uops which are ucode ops", + "MetricExpr": "100 * UOPS_RETIRED.MS / UOPS_RETIRED.ALL", + "MetricName": "Microcode_Uop_Ratio" + }, + { + "BriefDescription": "Percentage of all uops which are FPDiv uops", + "MetricExpr": "100 * UOPS_RETIRED.FPDIV / UOPS_RETIRED.ALL", + "MetricName": "FPDiv_Uop_Ratio" + }, + { + "BriefDescription": "Percentage of all uops which are IDiv uops", + "MetricExpr": "100 * UOPS_RETIRED.IDIV / UOPS_RETIRED.ALL", + "MetricName": "IDiv_Uop_Ratio" + }, + { + "BriefDescription": "Percentage of all uops which are x87 uops", + "MetricExpr": "100 * UOPS_RETIRED.X87 / UOPS_RETIRED.ALL", + "MetricName": "X87_Uop_Ratio" + }, + { + "BriefDescription": "Average Frequency Utilization relative nominal frequency", + "MetricExpr": "CLKS / CPU_CLK_UNHALTED.REF_TSC", + "MetricName": "Turbo_Utilization" + }, + { + "BriefDescription": "Fraction of cycles spent in Kernel mode", + "MetricExpr": "cpu@CPU_CLK_UNHALTED.CORE@k / CPU_CLK_UNHALTED.CORE", + "MetricName": "Kernel_Utilization" + }, + { + "BriefDescription": "Average CPU Utilization", + "MetricExpr": "CPU_CLK_UNHALTED.REF_TSC / TSC", + "MetricName": "CPU_Utilization" + }, + { + "BriefDescription": "Cycle cost per L2 hit", + "MetricExpr": "MEM_BOUND_STALLS.LOAD_L2_HIT / MEM_LOAD_UOPS_RETIRED.L2_HIT", + "MetricName": "Cycles_per_Demand_Load_L2_Hit" + }, + { + "BriefDescription": "Cycle cost per LLC hit", + "MetricExpr": "MEM_BOUND_STALLS.LOAD_LLC_HIT / MEM_LOAD_UOPS_RETIRED.L3_HIT", + "MetricName": "Cycles_per_Demand_Load_L3_Hit" + }, + { + "BriefDescription": "Cycle cost per DRAM hit", + "MetricExpr": "MEM_BOUND_STALLS.LOAD_DRAM_HIT / MEM_LOAD_UOPS_RETIRED.DRAM_HIT", + "MetricName": "Cycles_per_Demand_Load_DRAM_Hit" + }, + { + "BriefDescription": "Percent of instruction miss cost that hit in the L2", + "MetricExpr": "100 * MEM_BOUND_STALLS.IFETCH_L2_HIT / (MEM_BOUND_STALLS.IFETCH)", + "MetricName": "Inst_Miss_Cost_L2Hit_Percent" + }, + { + "BriefDescription": "Percent of instruction miss cost that hit in the L3", + "MetricExpr": "100 * MEM_BOUND_STALLS.IFETCH_LLC_HIT / (MEM_BOUND_STALLS.IFETCH)", + "MetricName": "Inst_Miss_Cost_L3Hit_Percent" + }, + { + "BriefDescription": "Percent of instruction miss cost that hit in DRAM", + "MetricExpr": "100 * MEM_BOUND_STALLS.IFETCH_DRAM_HIT / (MEM_BOUND_STALLS.IFETCH)", + "MetricName": "Inst_Miss_Cost_DRAMHit_Percent" + }, + { + "BriefDescription": "load ops retired per 1000 instruction", + "MetricExpr": "1000 * MEM_UOPS_RETIRED.ALL_LOADS / INST_RETIRED.ANY", + "MetricName": "MemLoadPKI" + }, + { + "BriefDescription": "C1 residency percent per core", + "MetricExpr": "cstate_core@c1\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C1_Core_Residency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "C6 residency percent per core", + "MetricExpr": "cstate_core@c6\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C6_Core_Residency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "C7 residency percent per core", + "MetricExpr": "cstate_core@c7\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C7_Core_Residency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "C2 residency percent per package", + "MetricExpr": "cstate_pkg@c2\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C2_Pkg_Residency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "C3 residency percent per package", + "MetricExpr": "cstate_pkg@c3\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C3_Pkg_Residency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "C6 residency percent per package", + "MetricExpr": "cstate_pkg@c6\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C6_Pkg_Residency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "C7 residency percent per package", + "MetricExpr": "cstate_pkg@c7\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C7_Pkg_Residency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "C8 residency percent per package", + "MetricExpr": "cstate_pkg@c8\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C8_Pkg_Residency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "C9 residency percent per package", + "MetricExpr": "cstate_pkg@c9\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C9_Pkg_Residency", + "ScaleUnit": "100%" + }, + { + "BriefDescription": "C10 residency percent per package", + "MetricExpr": "cstate_pkg@c10\\-residency@ / TSC", + "MetricGroup": "Power", + "MetricName": "C10_Pkg_Residency", + "ScaleUnit": "100%" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/alderlaken/cache.json b/lib/libpmc/pmu-events/arch/x86/alderlaken/cache.json new file mode 100644 index 000000000000..043445ae14a8 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/alderlaken/cache.json @@ -0,0 +1,330 @@ +[ + { + "BriefDescription": "Counts the number of cacheable memory requests that miss in the LLC. Counts on a per core basis.", + "EventCode": "0x2e", + "EventName": "LONGEST_LAT_CACHE.MISS", + "PublicDescription": "Counts the number of cacheable memory requests that miss in the Last Level Cache (LLC). Requests include demand loads, reads for ownership (RFO), instruction fetches and L1 HW prefetches. If the platform has an L3 cache, the LLC is the L3 cache, otherwise it is the L2 cache. Counts on a per core basis.", + "SampleAfterValue": "200003", + "UMask": "0x41" + }, + { + "BriefDescription": "Counts the number of cacheable memory requests that access the LLC. Counts on a per core basis.", + "EventCode": "0x2e", + "EventName": "LONGEST_LAT_CACHE.REFERENCE", + "PublicDescription": "Counts the number of cacheable memory requests that access the Last Level Cache (LLC). Requests include demand loads, reads for ownership (RFO), instruction fetches and L1 HW prefetches. If the platform has an L3 cache, the LLC is the L3 cache, otherwise it is the L2 cache. Counts on a per core basis.", + "SampleAfterValue": "200003", + "UMask": "0x4f" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to an instruction cache or TLB miss which hit in the L2, LLC, DRAM or MMIO (Non-DRAM).", + "EventCode": "0x34", + "EventName": "MEM_BOUND_STALLS.IFETCH", + "PublicDescription": "Counts the number of cycles the core is stalled due to an instruction cache or translation lookaside buffer (TLB) miss which hit in the L2, LLC, DRAM or MMIO (Non-DRAM).", + "SampleAfterValue": "200003", + "UMask": "0x38" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to an instruction cache or TLB miss which hit in DRAM or MMIO (Non-DRAM).", + "EventCode": "0x34", + "EventName": "MEM_BOUND_STALLS.IFETCH_DRAM_HIT", + "PublicDescription": "Counts the number of cycles the core is stalled due to an instruction cache or translation lookaside buffer (TLB) miss which hit in DRAM or MMIO (non-DRAM).", + "SampleAfterValue": "200003", + "UMask": "0x20" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to an instruction cache or TLB miss which hit in the L2 cache.", + "EventCode": "0x34", + "EventName": "MEM_BOUND_STALLS.IFETCH_L2_HIT", + "PublicDescription": "Counts the number of cycles the core is stalled due to an instruction cache or Translation Lookaside Buffer (TLB) miss which hit in the L2 cache.", + "SampleAfterValue": "200003", + "UMask": "0x8" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to an instruction cache or TLB miss which hit in the LLC or other core with HITE/F/M.", + "EventCode": "0x34", + "EventName": "MEM_BOUND_STALLS.IFETCH_LLC_HIT", + "PublicDescription": "Counts the number of cycles the core is stalled due to an instruction cache or Translation Lookaside Buffer (TLB) miss which hit in the Last Level Cache (LLC) or other core with HITE/F/M.", + "SampleAfterValue": "200003", + "UMask": "0x10" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to a demand load miss which hit in the L2, LLC, DRAM or MMIO (Non-DRAM).", + "EventCode": "0x34", + "EventName": "MEM_BOUND_STALLS.LOAD", + "SampleAfterValue": "200003", + "UMask": "0x7" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to a demand load miss which hit in DRAM or MMIO (Non-DRAM).", + "EventCode": "0x34", + "EventName": "MEM_BOUND_STALLS.LOAD_DRAM_HIT", + "SampleAfterValue": "200003", + "UMask": "0x4" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to a demand load which hit in the L2 cache.", + "EventCode": "0x34", + "EventName": "MEM_BOUND_STALLS.LOAD_L2_HIT", + "SampleAfterValue": "200003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts the number of cycles the core is stalled due to a demand load which hit in the LLC or other core with HITE/F/M.", + "EventCode": "0x34", + "EventName": "MEM_BOUND_STALLS.LOAD_LLC_HIT", + "PublicDescription": "Counts the number of cycles the core is stalled due to a demand load which hit in the Last Level Cache (LLC) or other core with HITE/F/M.", + "SampleAfterValue": "200003", + "UMask": "0x2" + }, + { + "BriefDescription": "Counts the number of load uops retired that hit in DRAM.", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_UOPS_RETIRED.DRAM_HIT", + "PEBS": "1", + "SampleAfterValue": "200003", + "UMask": "0x80" + }, + { + "BriefDescription": "Counts the number of load uops retired that hit in the L2 cache.", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_UOPS_RETIRED.L2_HIT", + "PEBS": "1", + "SampleAfterValue": "200003", + "UMask": "0x2" + }, + { + "BriefDescription": "Counts the number of load uops retired that hit in the L3 cache.", + "Data_LA": "1", + "EventCode": "0xd1", + "EventName": "MEM_LOAD_UOPS_RETIRED.L3_HIT", + "PEBS": "1", + "SampleAfterValue": "200003", + "UMask": "0x4" + }, + { + "BriefDescription": "Counts the number of cycles that uops are blocked for any of the following reasons: load buffer, store buffer or RSV full.", + "EventCode": "0x04", + "EventName": "MEM_SCHEDULER_BLOCK.ALL", + "SampleAfterValue": "20003", + "UMask": "0x7" + }, + { + "BriefDescription": "Counts the number of cycles that uops are blocked due to a load buffer full condition.", + "EventCode": "0x04", + "EventName": "MEM_SCHEDULER_BLOCK.LD_BUF", + "SampleAfterValue": "20003", + "UMask": "0x2" + }, + { + "BriefDescription": "Counts the number of cycles that uops are blocked due to an RSV full condition.", + "EventCode": "0x04", + "EventName": "MEM_SCHEDULER_BLOCK.RSV", + "SampleAfterValue": "20003", + "UMask": "0x4" + }, + { + "BriefDescription": "Counts the number of cycles that uops are blocked due to a store buffer full condition.", + "EventCode": "0x04", + "EventName": "MEM_SCHEDULER_BLOCK.ST_BUF", + "SampleAfterValue": "20003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts the number of load uops retired.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.ALL_LOADS", + "PEBS": "1", + "PublicDescription": "Counts the total number of load uops retired.", + "SampleAfterValue": "200003", + "UMask": "0x81" + }, + { + "BriefDescription": "Counts the number of store uops retired.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.ALL_STORES", + "PEBS": "1", + "PublicDescription": "Counts the total number of store uops retired.", + "SampleAfterValue": "200003", + "UMask": "0x82" + }, + { + "BriefDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 128 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.LOAD_LATENCY_GT_128", + "MSRIndex": "0x3F6", + "MSRValue": "0x80", + "PEBS": "2", + "PublicDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 128 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled. If a PEBS record is generated, will populate the PEBS Latency and PEBS Data Source fields accordingly.", + "SampleAfterValue": "1000003", + "UMask": "0x5" + }, + { + "BriefDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 16 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.LOAD_LATENCY_GT_16", + "MSRIndex": "0x3F6", + "MSRValue": "0x10", + "PEBS": "2", + "PublicDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 16 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled. If a PEBS record is generated, will populate the PEBS Latency and PEBS Data Source fields accordingly.", + "SampleAfterValue": "1000003", + "UMask": "0x5" + }, + { + "BriefDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 256 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.LOAD_LATENCY_GT_256", + "MSRIndex": "0x3F6", + "MSRValue": "0x100", + "PEBS": "2", + "PublicDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 256 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled. If a PEBS record is generated, will populate the PEBS Latency and PEBS Data Source fields accordingly.", + "SampleAfterValue": "1000003", + "UMask": "0x5" + }, + { + "BriefDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 32 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.LOAD_LATENCY_GT_32", + "MSRIndex": "0x3F6", + "MSRValue": "0x20", + "PEBS": "2", + "PublicDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 32 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled. If a PEBS record is generated, will populate the PEBS Latency and PEBS Data Source fields accordingly.", + "SampleAfterValue": "1000003", + "UMask": "0x5" + }, + { + "BriefDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 4 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.LOAD_LATENCY_GT_4", + "MSRIndex": "0x3F6", + "MSRValue": "0x4", + "PEBS": "2", + "PublicDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 4 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled. If a PEBS record is generated, will populate the PEBS Latency and PEBS Data Source fields accordingly.", + "SampleAfterValue": "1000003", + "UMask": "0x5" + }, + { + "BriefDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 512 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.LOAD_LATENCY_GT_512", + "MSRIndex": "0x3F6", + "MSRValue": "0x200", + "PEBS": "2", + "PublicDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 512 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled. If a PEBS record is generated, will populate the PEBS Latency and PEBS Data Source fields accordingly.", + "SampleAfterValue": "1000003", + "UMask": "0x5" + }, + { + "BriefDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 64 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.LOAD_LATENCY_GT_64", + "MSRIndex": "0x3F6", + "MSRValue": "0x40", + "PEBS": "2", + "PublicDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 64 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled. If a PEBS record is generated, will populate the PEBS Latency and PEBS Data Source fields accordingly.", + "SampleAfterValue": "1000003", + "UMask": "0x5" + }, + { + "BriefDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 8 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.LOAD_LATENCY_GT_8", + "MSRIndex": "0x3F6", + "MSRValue": "0x8", + "PEBS": "2", + "PublicDescription": "Counts the number of tagged loads with an instruction latency that exceeds or equals the threshold of 8 cycles as defined in MEC_CR_PEBS_LD_LAT_THRESHOLD (3F6H). Only counts with PEBS enabled. If a PEBS record is generated, will populate the PEBS Latency and PEBS Data Source fields accordingly.", + "SampleAfterValue": "1000003", + "UMask": "0x5" + }, + { + "BriefDescription": "Counts the number of retired split load uops.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.SPLIT_LOADS", + "PEBS": "1", + "SampleAfterValue": "200003", + "UMask": "0x41" + }, + { + "BriefDescription": "Counts the number of stores uops retired. Counts with or without PEBS enabled.", + "Data_LA": "1", + "EventCode": "0xd0", + "EventName": "MEM_UOPS_RETIRED.STORE_LATENCY", + "PEBS": "2", + "PublicDescription": "Counts the number of stores uops retired. Counts with or without PEBS enabled. If PEBS is enabled and a PEBS record is generated, will populate PEBS Latency and PEBS Data Source fields accordingly.", + "SampleAfterValue": "1000003", + "UMask": "0x6" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by the L3 cache.", + "EventCode": "0xB7", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F803C0001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by the L3 cache where a snoop was sent, the snoop hit, and modified data was forwarded.", + "EventCode": "0xB7", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C0001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by the L3 cache where a snoop was sent, the snoop hit, but no data was forwarded.", + "EventCode": "0xB7", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HIT_NO_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x4003C0001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand data reads that were supplied by the L3 cache where a snoop was sent, the snoop hit, and non-modified data was forwarded.", + "EventCode": "0xB7", + "EventName": "OCR.DEMAND_DATA_RD.L3_HIT.SNOOP_HIT_WITH_FWD", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x8003C0001", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) and software prefetches for exclusive ownership (PREFETCHW) that were supplied by the L3 cache.", + "EventCode": "0xB7", + "EventName": "OCR.DEMAND_RFO.L3_HIT", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x3F803C0002", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts demand reads for ownership (RFO) and software prefetches for exclusive ownership (PREFETCHW) that were supplied by the L3 cache where a snoop was sent, the snoop hit, and modified data was forwarded.", + "EventCode": "0xB7", + "EventName": "OCR.DEMAND_RFO.L3_HIT.SNOOP_HITM", + "MSRIndex": "0x1a6,0x1a7", + "MSRValue": "0x10003C0002", + "SampleAfterValue": "100003", + "UMask": "0x1" + }, + { + "BriefDescription": "Counts the number of issue slots every cycle that were not delivered by the frontend due to instruction cache misses.", + "EventCode": "0x71", + "EventName": "TOPDOWN_FE_BOUND.ICACHE", + "SampleAfterValue": "1000003", + "UMask": "0x20" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/alderlaken/floating-point.json b/lib/libpmc/pmu-events/arch/x86/alderlaken/floating-point.json new file mode 100644 index 000000000000..30e8ca3c1485 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/alderlaken/floating-point.json @@ -0,0 +1,18 @@ +[ + { + "BriefDescription": "Counts the number of floating point operations retired that required microcode assist.", + "EventCode": "0xc3", + "EventName": "MACHINE_CLEARS.FP_ASSIST", + "PublicDescription": "Counts the number of floating point operations retired that required microcode assist, which is not a reflection of the number of FP operations, instructions or uops.", + "SampleAfterValue": "20003", + "UMask": "0x4" + }, + { + "BriefDescription": "Counts the number of floating point divide uops retired (x87 and SSE, including x87 sqrt).", + "EventCode": "0xc2", + "EventName": "UOPS_RETIRED.FPDIV", + "PEBS": "1", + "SampleAfterValue": "2000003", + "UMask": "0x8" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/alderlaken/frontend.json b/lib/libpmc/pmu-events/arch/x86/alderlaken/frontend.json new file mode 100644 *** 1012 LINES SKIPPED *** From nobody Thu Dec 4 18:37:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMjsz3q1Nz6Jlmk for ; Thu, 04 Dec 2025 18:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMjsz367Hz3gVK for ; Thu, 04 Dec 2025 18:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764873447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WdF7zjS94+kZ83KGPlLgndhTcnXJIBx3DCcxtqBgDvM=; b=EF8UFRtyNgyeo8HQ3EcuKzBT2dDEZ5PwYhE8eVz1f//kq2FcdU9wJPGERiGkug3TwFQm0H hds4s9SO0G1MIXijppE/hBQmAhxTD91UqLBLspR/Z5lhWCefeqgZLduO78c/BM90KOTPzu YrA4a8MLE7TGvJvbctu5YRGDH5jR2pvoT9SCxbnyS3ZthAuHs4E2ndEJBJ5v2QFLu6Rwg2 0M0dzl+lseZmDPShA9u70XannKUM+YDRurYfigvwJcLRMDQVyLkohqEBIfUSZA6FUDQ1Zg DqGIaPR07v4aamcA27t+NKuKqZ+iXDAy3JvZEVevF0eobwp+fM1zdu94vUFYYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764873447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WdF7zjS94+kZ83KGPlLgndhTcnXJIBx3DCcxtqBgDvM=; b=D8H1+cA7f1Y75rjzySkvRbNu0HUEdARSNypkgNDeeAKGcrJbfOEZsZpqddJoAl9ZUdiRTE nBiKKuxHhPICZJLMEficcc3LgJljbY9dFl+ByTrRtgP7fITOJx5wIst5e/6xWkhnxX6xL5 eQ9/DbupapQ8Z6/qXKlhFhpDJ2kUAVdakOkOLoYIXLfMKb5iwjI9PBmu+8v6Obzrj86gmz 88tkmyMHxvzV58Cm/L3Cx6KxIqIrsug3sYcMMUZzt2TQL138uQCrjOyk5eQb7K3idWFv1q BsnftR9aClefqRnMV5krpgrv/7HJdOwBnVC5rQ57LZoUfDiT8e5uT7iY0kzAtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764873447; a=rsa-sha256; cv=none; b=q/eKrM2apA1ITll1UvffmZsIAS2OqzN/DWLq8+ZJDmhPI0h1z8cPMRq6EJW4Rms9Veyxf1 Txuo1R83qYkg5La/FyK0wH97p74qY0XW5/WYCQbBklvb0FQeXgjuS9MAVOi9wEYivc4xJz L+X3M4bK8vssbss12eeyvpRTVNBI75Dgl790ALdD69N3CfICSqxhoIpHSyKKdr5USethYB eNXTbzwo7QN9o3MScNFNDDC144AllQnX7IY2XnvzBI2snjdPNANTXsZ9ozgz3pwEcaYP3h h0KNBzxADcyUO87VevmRafv2ZTx0cFH74Fqyw41yj3bOgRya3hQ+PvgTkFOVdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMjsz2ZjPzcB5 for ; Thu, 04 Dec 2025 18:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cb8d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 18:37:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 2ace05b65a2c - main - pfind(9): follow-up fixes and improvements List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 2ace05b65a2c912888aeec921fc6f990a5c36909 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 18:37:27 +0000 Message-Id: <6931d4e7.cb8d.94fb306@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2ace05b65a2c912888aeec921fc6f990a5c36909 commit 2ace05b65a2c912888aeec921fc6f990a5c36909 Author: Mitchell Horne AuthorDate: 2023-01-28 18:48:33 +0000 Commit: Mitchell Horne CommitDate: 2025-12-04 18:37:18 +0000 pfind(9): follow-up fixes and improvements (Found on a branch from a year ago.) - Adjust NAMEs - MLINKS: add pfind_any.9, pfind_any_locked.9; remove old zpfind.9 - Reword the description of pfind_any() so that it doesn't imply only zombie processes are returned - Fix a comma - Use .Dv for the macro PRS_ZOMBIE - Move the (logically separate) final statement to a new paragraph - .Xr to pget(9) Reviewed by: 0mp Fixes: 07d78399eb79 ("pfind(9): Update to recent behavior") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53548 --- ObsoleteFiles.inc | 3 +++ share/man/man9/Makefile | 3 ++- share/man/man9/pfind.9 | 34 +++++++++++++++++----------------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 51338fea9bf6..e42fcb7d8f84 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20251204: zpfind.9 alias to pfind.9 removed +OLD_FILES+=usr/share/man/man9/zpfind.9 + # 20251121: Remove duplicate pam_krb5 manual page OLD_FILES+=usr/share/man/man8/pam-krb5.8.gz diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index ac5224b76444..8cc0add54f2e 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1853,7 +1853,8 @@ MLINKS+=pfil.9 pfil_add_hook.9 \ pfil.9 pfil_remove_hook.9 \ pfil.9 pfil_run_hooks.9 \ pfil.9 pfil_link.9 -MLINKS+=pfind.9 zpfind.9 +MLINKS+=pfind.9 pfind_any.9 \ + pfind.9 pfind_any_locked.9 MLINKS+=PHOLD.9 PRELE.9 \ PHOLD.9 _PHOLD.9 \ PHOLD.9 _PRELE.9 \ diff --git a/share/man/man9/pfind.9 b/share/man/man9/pfind.9 index ebcf7a565150..298b6b3ef326 100644 --- a/share/man/man9/pfind.9 +++ b/share/man/man9/pfind.9 @@ -22,11 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 3, 2024 +.Dd November 3, 2025 .Dt PFIND 9 .Os .Sh NAME -.Nm pfind , zpfind +.Nm pfind , +.Nm pfind_any , +.Nm pfind_any_locked .Nd locate a process by number .Sh SYNOPSIS .In sys/param.h @@ -38,16 +40,13 @@ .Ft "struct proc *" .Fn pfind_any_locked "pid_t pid" .Sh DESCRIPTION +The .Fn pfind -takes a -.Fa pid -as its argument and returns a pointer to the -.Vt proc -structure whose PID is specified in the argument only if the -.Fa pid -is on the -.Va allproc -list. +function walks the list of processes in the system, looking for the one with a +process ID of +.Fa pid . +If the process exists, and is not in the zombie state, a pointer to the process +structure will be returned. .Pp .Fn pfind_any takes a @@ -56,21 +55,21 @@ as its argument. .Fn pfind_any searches the .Va allproc -list and returns the first process whose PID matches and whose state is -.Va PRS_ZOMBIE . +list and returns the first process with a matching PID, whose state may be +.Dv PRS_ZOMBIE . .Pp .Fn pfind_any_locked is similar to -.Fn pfind_any -,but it does not lock the process hash bucket -for the given +.Fn pfind_any , +but it does not lock the process hash bucket for the given .Vt pid . Instead, it asserts the corresponding process hash bucket is already locked. +.Pp All three functions .Fn pfind , .Fn pfind_any , and -.Fn pgfind_any_locked +.Fn pfind_any_locked lock the .Vt proc structure before returning. @@ -85,6 +84,7 @@ structure on success or .Dv NULL on failure. .Sh SEE ALSO +.Xr pget 9 , .Xr pgfind 9 .Sh AUTHORS This manual page was written by From nobody Thu Dec 4 18:52:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMkC66qwmz6JnZF for ; Thu, 04 Dec 2025 18:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMkC64T61z3jK5 for ; Thu, 04 Dec 2025 18:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764874338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EoBztBwJGWe8QX/eUS5QNsakzjx4Y170Hsb2zoa9uqo=; b=otk8776q8FBaO5sp6VUPOYzmHjjFeYeAeR2ZNw79Bc08uH1kRIU1gKvPbXJYkR0cbr98/P WT66yXKYSAjlwr79a7T2HVvvK2NHQ2HDzFwJ896f1+T4mwmdz33TcDQ+6POEKWtIAxBFLY ZxwfEz90N3GsSiMV4IgwywELq3IvOajTkJotKvhXGE5bx8Ks69Kkbsf+fWsEcFWROc5lKc ecRqduiMGCyutWTeJ8ZlDvSMPNrTIR2mvlNfUAawBGJlEkioTXjslbfmMQdyaVFUe6Bwun K71OfiAonbVkKOlKs1p5WswJp55uo9eqhY+i1olzEdd+AAJOi12l3FV0WX3p5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764874338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EoBztBwJGWe8QX/eUS5QNsakzjx4Y170Hsb2zoa9uqo=; b=rnsd4RcRQGl1HQvSBLFsnrAmj13pxcrCK+Sqp7yIaYXI3f/t63zd44Z5yX5lVmvgjLcAgi dimY4qLLU/KTAMuAE3RnjkWrVaBfKAddyxlwM6ZTf1qV70sqFZQ02ufL2BCOS/YvQkzzud VRSVbVGd+2hqjpDubAA/2CzEYM2hbvd95tlUiFlH28+YUVamYHKn93KEFfYM0ARdXoFOI2 XOzlhTarUVzbDXoINgXFkmX1j4F+0ugxoWhtXY0H5l0C2Unnsr9Gkduvw3hxHjxmjskdKz D8+z4fF7TN41VUVdNhV5COh2izi+DVPWJqNs4Yt4keVJ4R5I/HCNLjUegjsRBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764874338; a=rsa-sha256; cv=none; b=hdM1Fg8/KGzf30SUeSYsDdqM90y8lksz72h3drnHBRWxzRlud6vGzcmoIqN7p9zGHZ2UDN 61EgLiD0qljR8P9qioBVPQW1J2h0hP5j7+GRjqLwdrx+A7sVIW3rp15o1sSZ4+YcIREYf5 4XgJtsdftnu3yE9RkWNlqye0MKK3jVdLmQBvHU3bX53FA18ECveTALQ/8Vn6JC1ME9d17G 8hqYJeFRL6+zHIkcgUoQR9ut4qdlbAMpGJ9xghOL4sD4Ccg3W1cVdIlO0hfRmZo4f3OdkQ TAWiiw6utkzpqYr0t3mREZXd0nkZ8tOmI2vm6sP0c3VnnEJvW9emrP9nCQDaTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMkC643txzcjY for ; Thu, 04 Dec 2025 18:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e42e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 18:52:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 27ff90cd3d8d - main - tests/carp: make a 0.2 second pause before configuring second jail List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27ff90cd3d8d2ac8198f30cbebeefb15a49d41bc Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 18:52:18 +0000 Message-Id: <6931d862.e42e.f5cefaa@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=27ff90cd3d8d2ac8198f30cbebeefb15a49d41bc commit 27ff90cd3d8d2ac8198f30cbebeefb15a49d41bc Author: Gleb Smirnoff AuthorDate: 2025-12-04 18:41:19 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-04 18:52:01 +0000 tests/carp: make a 0.2 second pause before configuring second jail for all scenarios where both jails have same priority/advskew. There is a tiny chance that on both sides carp_master_down() will be executed in parallel and advertisements will also fly through the bridge(4) in parallel, thus both sides will switch to MASTER before receiving the announcement from peer. This makes the test to fail. So far this flakyness was observed for carp:vrrp_v4 only, but in theory it is possible for any of the patched scenarios. Note that this sleep does not prolong execution of the tests, as the first jail is already configured, and if we slept before configuring the second, we would sleep less in wait_for_carp(). --- tests/sys/netinet/carp.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index a9c99a7d701f..90ed9d6f9baf 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -90,6 +90,7 @@ basic_v4_body() jexec carp_basic_v4_two ifconfig ${epair_one}b 192.0.2.202/29 up jexec carp_basic_v4_two ifconfig ${epair_one}b add vhid 1 192.0.2.1/29 + sleep 0.2 jexec carp_basic_v4_three ifconfig ${epair_two}b 192.0.2.203/29 up jexec carp_basic_v4_three ifconfig ${epair_two}b add vhid 1 \ 192.0.2.1/29 @@ -137,6 +138,7 @@ vrrp_v4_body() jexec ${j}_two ifconfig ${epair_one}b 192.0.2.202/29 up jexec ${j}_two ifconfig ${epair_one}b add vhid 1 carpver 3 192.0.2.1/29 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b 192.0.2.203/29 up jexec ${j}_three ifconfig ${epair_two}b add vhid 1 carpver 3 \ 192.0.2.1/29 @@ -182,6 +184,7 @@ unicast_v4_body() jexec carp_uni_v4_two ifconfig ${epair_one}b add vhid 1 \ peer 198.51.100.224 192.0.2.1/32 + sleep 0.2 jexec carp_uni_v4_three sysctl net.inet.ip.forwarding=1 jexec carp_uni_v4_three ifconfig ${epair_two}b 198.51.100.224/25 up jexec carp_uni_v4_three route add 198.51.100.2 198.51.100.129 @@ -253,6 +256,7 @@ basic_v6_body() jexec carp_basic_v6_two ifconfig ${epair_one}b inet6 add vhid 1 \ 2001:db8::0:1/64 + sleep 0.2 jexec carp_basic_v6_three ifconfig ${epair_two}b inet6 2001:db8::1:3/64 up no_dad jexec carp_basic_v6_three ifconfig ${epair_two}b inet6 add vhid 1 \ 2001:db8::0:1/64 @@ -303,6 +307,7 @@ vrrp_v6_body() jexec ${j}_two ifconfig ${epair_one}b inet6 add vhid 1 carpver 3 \ 2001:db8::0:1/64 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b inet6 2001:db8::1:3/64 up no_dad jexec ${j}_three ifconfig ${epair_two}b inet6 add vhid 1 carpver 3 \ 2001:db8::0:1/64 @@ -358,6 +363,7 @@ unicast_v6_body() peer6 2001:db8:2::2 \ 2001:db8::0:1/64 + sleep 0.2 jexec carp_uni_v6_three ifconfig ${epair_two}b inet6 2001:db8:2::2/64 \ no_dad up jexec carp_uni_v6_three route -6 add default 2001:db8:2::1 @@ -423,6 +429,7 @@ unicast_ll_v6_body() jexec ${j}_two ifconfig ${epair_one}b inet6 add vhid 1 \ peer6 ${ll_two} \ 2001:db8::0:1/64 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b inet6 add vhid 1 \ peer6 ${ll_one} \ 2001:db8::0:1/64 From nobody Thu Dec 4 18:52:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMkC615Wtz6JnZB for ; Thu, 04 Dec 2025 18:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMkC53w26z3jK4 for ; Thu, 04 Dec 2025 18:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764874337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fcSdZKWtCclkm1nB0SAEWokVOWVTXL+Nbkl+Fgkqg3Q=; b=BJyeQIOn+Zb9RiRHpv9nmfmULkbC+TJXWM9GimfDezhCgojKcnPT+0yKzrSOWlj07uEtD5 0yNVgWCl3OwpTfh2pHMIIaomDNwucKXIInNFeLzaFMfh7KbjsKYdueAzm9E4H/rXmJXznD Twt5a/2W1wzBgTBneT/E02oNAQOQopQlcJ7GPHRFI9JYvK+nR57Pk5kxbLmX4t0beDvtCH mXcBMlj3JGTPsJK3Wu4J29wV1i9Y3Y/1TyCaqw4Reo+OEfssANPrP2/XUpJY2rmoG28xFc Av+pW7KPa/jp5SLgNZ93BcQJxm7pskAeuekf4IaHSpzlf7iiJSiE78MouHfh2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764874337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fcSdZKWtCclkm1nB0SAEWokVOWVTXL+Nbkl+Fgkqg3Q=; b=S/1bAqWaL0SbytvYki3TpNOUVdvDJFDxgOUSoJfdvtR/kghkOb3VFtrgOMU2eD7CQMwVOS B3KjiRL/CIbxFh1g+IrNDOxpe7Gzo+5tsOcJGqjOPlVeAe4wKxCoujYcR/veq+Nwwmefup liN4wB3G8x9BHd8QNZ8hI/S2LAV32QclOupP9Qs9vBQgdjvo0BwSYGopq6XnkRLbyd5E5x YxChWTjBJXJgki5KtUHzTMhoNN14vr9TGEiu/EkCgDEhuuOg8swsRZWAVDmON4RrsfJdn8 qhLNZXzmFVO5+MYCQxZYrIFRqAyTBMluYBPytcf8aOqv/bLGN+S3i3RiRmw+3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764874337; a=rsa-sha256; cv=none; b=YSjYhgrvk22dxh8IivLFDvHDcJrKgFGvicwIsxPZ3NSa79unsIuJnjCze+4jpQIwxhb0uF eVvQl9SQOGABO2CAmEfqQCx57pOiGc/pn6BhKkW6ly8X4Sxfxf9mQakuNsTgQJueNPynqB SNegor/nLqXGR/OOwWE32Wg6kYVGigmTZm/0M94ZD1ISfT7oPJNVeis49CvxLKzzmZS3+U oPUdlChr/l3mrV574YchC1v5BzqTcocrREYwiyffF5jhaHbHi5v5bShRV14+kuFwoGuqfn 6CWg3gv15BmLnVZCRdzaNVbXQvXsXsLkyNw1ufOtGPl9n/0iH+CB+7zhDQd8aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMkC53GNGzcpB for ; Thu, 04 Dec 2025 18:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e586 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 18:52:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e353cbffd600 - main - tests/carp: make sleep interval in the wait loop smaller List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e353cbffd600ae3c00c8584dddcabf9d0ae1202a Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 18:52:17 +0000 Message-Id: <6931d861.e586.47314579@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e353cbffd600ae3c00c8584dddcabf9d0ae1202a commit e353cbffd600ae3c00c8584dddcabf9d0ae1202a Author: Gleb Smirnoff AuthorDate: 2025-12-04 18:40:34 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-04 18:52:01 +0000 tests/carp: make sleep interval in the wait loop smaller Makes tests to finish slightly faster. --- tests/sys/netinet/carp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index 568d2beaf914..a9c99a7d701f 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -43,7 +43,7 @@ wait_for_carp() while [ -z "$(is_master ${jail1} ${itf1})" ] && [ -z "$(is_master ${jail2} ${itf2})" ]; do - sleep 1 + sleep 0.1 done if [ -n "$(is_master ${jail1} ${itf1})" ] && From nobody Thu Dec 4 19:12:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMkfB2hhJz6JpRT for ; Thu, 04 Dec 2025 19:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMkfB2CDZz3mh1 for ; Thu, 04 Dec 2025 19:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764875538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fSeei9dsZTl8TgwWG0b5vSHPVCv4V9vGXlkgRf00W5U=; b=HpKMrsvrA1IhJLCRy87DrrP9ZCBAgXeaPuXLO7sAB32pd/+7rS5Jl8GX4z8VP9mk/HvDBz LhZSQyTuGt5fUMPODJTr/eS2AcRLy4UeSYZklxIZbM2UtND1Jd2rdxwmPxR1tT23PCi3eo rF6kGFLbipxc/zPjP2nhunjKDwSjWrFt7DOwnBs6hueMtCsEEWxks5T3Zqoi80339g2/ea vwbAp1jqyepdbeK4u1Qdo2lAk97rcr/CaJns27XN9LIR6s13qqDBLpBk5MdnfTzoj9luHZ Tjxeo2jNNoJq3Un5cHio14czyPTz86z+cqP852flXaJdaHVEwm3lvaTAH5m73g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764875538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fSeei9dsZTl8TgwWG0b5vSHPVCv4V9vGXlkgRf00W5U=; b=r+hK2dBsu9cCIPBsAvTeeLLevSHpdgBrPsqMqPOeJw8Dv8brLpMZ8yXLaxlMLZYz3wCJZI Q5Pd6P0b4lv+ExqkgVP7S2ZSZGVmzmb0nUHjuA+53uKSPKfBD+VL4VKqn/98O2nY6xk8bv +C4YVpOvSFNSkp1MXCUxn4yupQYncCsZ4vxKM1W8C2SnCWWbAJ/lpy0QieIvKQOCytbtGI 2a/TLHCGAVFhAwAEMu73bd/iOzgXl/U6KSRhE9JSmC5BDCs0T2G2mT5URVeB5SiQnE04vZ 2i/SKEFnCcJOsnkEMMxGqEEsW6mG+sumeV2J9hp8Bw8uZ8KWEGMKZZZqK8tlcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764875538; a=rsa-sha256; cv=none; b=E+3J47xTF01jiy6/eMaR7SgvWoy+RX69EBRHMX61Hh1YMmotd2Dk7WF8tqk6sL4XGCKbrB uURHpa9+yzQiHE4sbamock67124r7uY7/ApCa/jI2Wl3GKVgSfXESfVEyezOzsacOS93ok 0vZhZjJp/GcC8aAAof2oJITtb/c7HOv08Vc9P31cfZAYbgC3P9qCM7t9yTBNZXLOgDQLfe trkbznhLND8yiGrnDS6fwdRmJBMaRrBUBgNXexvTCKEPRRPVHCRndxek5D/et+Xs9em/na V4Alv8fuVJaSPQhEra58bWa3ehluvXc/xQ3nXOXLKgvxYT+k5UqSen2px+D8TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMkfB1mFNzdS3 for ; Thu, 04 Dec 2025 19:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e570 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 19:12:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c7f05ef82478 - main - net: routing table attach never fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7f05ef8247878c6cd565a71039ec49f202c22fd Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 19:12:13 +0000 Message-Id: <6931dd0d.e570.2bdfe964@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f05ef8247878c6cd565a71039ec49f202c22fd commit c7f05ef8247878c6cd565a71039ec49f202c22fd Author: Gleb Smirnoff AuthorDate: 2025-12-04 19:12:03 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-04 19:12:03 +0000 net: routing table attach never fails --- sys/net/route/route_tables.c | 6 +----- sys/netinet/in_rmx.c | 3 --- sys/netinet6/in6_rmx.c | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/net/route/route_tables.c b/sys/net/route/route_tables.c index 3b7bb1385d0e..749ef063e125 100644 --- a/sys/net/route/route_tables.c +++ b/sys/net/route/route_tables.c @@ -254,11 +254,7 @@ grow_rtables(uint32_t num_tables) if (*prnh != NULL) continue; rh = dom->dom_rtattach(i); - if (rh == NULL) - log(LOG_ERR, "unable to create routing table for %d.%d\n", - dom->dom_family, i); - else - populate_kernel_routes(new_rt_tables, rh); + populate_kernel_routes(new_rt_tables, rh); *prnh = rh; } } diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index b8599143b991..4a2dc9905d0a 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -119,9 +119,6 @@ in_inithead(uint32_t fibnum) struct rib_head *rh; rh = rt_table_init(32, AF_INET, fibnum); - if (rh == NULL) - return (NULL); - rh->rnh_set_nh_pfxflags = rib4_set_nh_pfxflags; rh->rnh_augment_nh = rib4_augment_nh; diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c index 6eb61600b8df..d1c121115b60 100644 --- a/sys/netinet6/in6_rmx.c +++ b/sys/netinet6/in6_rmx.c @@ -145,9 +145,6 @@ in6_inithead(uint32_t fibnum) rh = rt_table_init(offsetof(struct sockaddr_in6, sin6_addr) << 3, AF_INET6, fibnum); - if (rh == NULL) - return (NULL); - rh->rnh_set_nh_pfxflags = rib6_set_nh_pfxflags; rh->rnh_augment_nh = rib6_augment_nh; From nobody Thu Dec 4 19:23:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMktw17wNz6JqWQ for ; Thu, 04 Dec 2025 19:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMktw0Plwz3nmP for ; Thu, 04 Dec 2025 19:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764876200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6WBWhaRSIQeYKMjzo6UZ1AyytpRLVPCibDrWLyj8+I=; b=H7Qb+mUczOf3CjO1j+UawCskyXMvN1Sy2/cY3EIcVNoUmawXtjeHKSNlXILwbZ57dvc2oS exDFqaxfimzSR6w0DDhT+Mo6CusSgIUAUpXbk13A7rJJlmXMouqoD0E1MFgZwfCaCTh7L7 4i1ES/e+uErdxD1dKTYFCu0icf8L1BlK5DlDK2KTJ0cImjNc3NGALAeDQtCLIjIpVEBzYE KVD95vKugToj9VvwWWrAOkruAOKAtfxTSPkMiGUG1QW/IiAW0CYnqDan4+AHCZcVxn9je0 5KBIzt6O09zyLsurxgxH2cd3cJUTRxS/QdlMKhIFkaNyeIbcwgWo2kAFANu6ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764876200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U6WBWhaRSIQeYKMjzo6UZ1AyytpRLVPCibDrWLyj8+I=; b=ZnH0KUzuTq3C5x3REyN4bsfQixQcEGDm1rtnQr8UlE2BAKBT44HwqAgMmksfkwWmc+AzCR UFv8SrISMFBFv29H+KD8xDp02po70b4o56PEyyLM/GJVgNU5UbpmTfdnh8ZdnJeX23TDjf zZSu8yr4G6ZFGV67M3YX0GtllX0iIpjGIzq5UU4Piq3Jooo2ujGP/W1fYeqWbPAaeywsow kL/ArgEFG2rnwYtlmeB8hBTuRN2fUECB0OHBQXewdQq2kKrBM993gTrBn2K0tlGvcIzvfV bclWzDj52PDXY6b5N5dhF9jaWP/v7NH3vrpqFLfWqMcQAfLpBS5w1yMMPGUIqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764876200; a=rsa-sha256; cv=none; b=gOFdx5dP2XGFCAlu7JHbZM3tZ9BlMWFRP6HENljeM++GjUHMGQoE/LrvC9/mmwxd1rdvFg EDuLYU/8WC97AHAuxdJ7b2r2GyjfSJHwfTMQKmhKOdBpjK/oD71jlLV2WqsKVSD79IVYXr /dTZckbeGIXntrTJn6FYUKR13zjLrhYIUpqKor2ESA4Hm0ELmb6UJGaEYFdPh1RV7Xi7HZ Pe38pSJT9y+yhPLVeNk/cvVLSsqMp30R5GzX3OQZNYI/xChoizL1ODl0Hyxh2G/kXft8Cf zeo7iUhJxhKKJiLZW+hu9kkpw2V/z6VKFIh4U0SJ/77q6ZPXdNtsj2A2FTZUAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMktv73CMzdfy for ; Thu, 04 Dec 2025 19:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2251b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 19:23:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: fd131b47f20d - main - net: remove dom_ifmtu List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd131b47f20dbeb515f5e3e6ea87948f2638eda9 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 19:23:19 +0000 Message-Id: <6931dfa7.2251b.38da8d45@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fd131b47f20dbeb515f5e3e6ea87948f2638eda9 commit fd131b47f20dbeb515f5e3e6ea87948f2638eda9 Author: Gleb Smirnoff AuthorDate: 2025-12-04 19:14:34 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-04 19:16:25 +0000 net: remove dom_ifmtu It is a remnant of a network stack design that was supposed to support multiple network protocols. Today it is clear that we are left with IPv4 and IPv6 only. Only IPv6 may have an MTU different to the interface MTU. --- sys/net/if.c | 13 ------------- sys/net/if_var.h | 1 - sys/net/route.c | 33 ++++++++++++++++++--------------- sys/netinet6/in6.c | 7 ++----- sys/netinet6/in6_proto.c | 1 - sys/netinet6/in6_var.h | 2 +- sys/sys/domain.h | 2 -- 7 files changed, 21 insertions(+), 38 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index cb9c47c14c32..f5006781541c 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4467,19 +4467,6 @@ if_getmtu(const if_t ifp) return (ifp->if_mtu); } -int -if_getmtu_family(const if_t ifp, int family) -{ - struct domain *dp; - - SLIST_FOREACH(dp, &domains, dom_next) { - if (dp->dom_family == family && dp->dom_ifmtu != NULL) - return (dp->dom_ifmtu(ifp)); - } - - return (ifp->if_mtu); -} - void if_setppromisc(if_t ifp, bool ppromisc) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 961259bb0ca1..b717e879815b 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -620,7 +620,6 @@ const uint8_t *if_getbroadcastaddr(const if_t ifp); void if_setbroadcastaddr(if_t ifp, const uint8_t *); int if_setmtu(if_t ifp, int mtu); int if_getmtu(const if_t ifp); -int if_getmtu_family(const if_t ifp, int family); void if_notifymtu(if_t ifp); void if_setppromisc(const if_t ifp, bool ppromisc); int if_setflagbits(if_t ifp, int set, int clear); diff --git a/sys/net/route.c b/sys/net/route.c index d2c9f3e39c17..5dbb51a34e56 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -508,26 +508,29 @@ rt_getifa_fib(struct rt_addrinfo *info, u_int fibnum) return (error); } +/* + * Try to update rt_mtu for all routes using this interface. Unfortunately the + * only way to do this is to traverse all routing tables in all fibs. + */ void rt_updatemtu(struct ifnet *ifp) { struct rib_head *rnh; - int mtu; - int i, j; +#ifdef INET6 + uint32_t in6mtu; - /* - * Try to update rt_mtu for all routes using this interface - * Unfortunately the only way to do this is to traverse all - * routing tables in all fibs/domains. - */ - for (i = 1; i <= AF_MAX; i++) { - mtu = if_getmtu_family(ifp, i); - for (j = 0; j < rt_numfibs; j++) { - rnh = rt_tables_get_rnh(j, i); - if (rnh == NULL) - continue; - nhops_update_ifmtu(rnh, ifp, mtu); - } + in6mtu = in6_ifmtu(ifp); +#endif + + for (u_int j = 0; j < rt_numfibs; j++) { +#ifdef INET + rnh = rt_tables_get_rnh(j, AF_INET); + nhops_update_ifmtu(rnh, ifp, ifp->if_mtu); +#endif +#ifdef INET6 + rnh = rt_tables_get_rnh(j, AF_INET6); + nhops_update_ifmtu(rnh, ifp, in6mtu); +#endif } } diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index f2a032585342..0456ec5decf1 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2612,12 +2612,9 @@ in6_domifattach(struct ifnet *ifp) return ext; } -int -in6_domifmtu(struct ifnet *ifp) +uint32_t +in6_ifmtu(struct ifnet *ifp) { - if (ifp->if_afdata[AF_INET6] == NULL) - return ifp->if_mtu; - return (IN6_LINKMTU(ifp)); } diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index a566ca6b0fb0..f3ed72719abf 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -113,7 +113,6 @@ struct domain inet6domain = { #endif .dom_ifattach = in6_domifattach, .dom_ifdetach = in6_domifdetach, - .dom_ifmtu = in6_domifmtu, .dom_nprotosw = 14, .dom_protosw = { &tcp6_protosw, diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 1414cc71388d..1210937a5dc4 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -869,7 +869,7 @@ int in6if_do_dad(struct ifnet *); void in6_savemkludge(struct in6_ifaddr *); void *in6_domifattach(struct ifnet *); void in6_domifdetach(struct ifnet *, void *); -int in6_domifmtu(struct ifnet *); +uint32_t in6_ifmtu(struct ifnet *); struct rib_head *in6_inithead(uint32_t fibnum); void in6_detachhead(struct rib_head *rh); int in6_if2idlen(struct ifnet *); diff --git a/sys/sys/domain.h b/sys/sys/domain.h index dfdda1bc9491..5639ef1c01e5 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -58,8 +58,6 @@ struct domain { (struct rib_head *); void *(*dom_ifattach)(struct ifnet *); void (*dom_ifdetach)(struct ifnet *, void *); - int (*dom_ifmtu)(struct ifnet *); - /* af-dependent data on ifnet */ struct protosw *dom_protosw[]; }; From nobody Thu Dec 4 19:48:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMlRv0F3Rz6JcbG for ; Thu, 04 Dec 2025 19:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMlRt5Fvnz3sBY for ; Thu, 04 Dec 2025 19:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764877706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2nqQsD8EbMRO0yFdmoWxYcU52YYmimrsEt0VpQx3Ks=; b=xbaw5eA/2SZp28CfECiMdrpLWE2VxzuXNC5ZPWJY+33zQlFHln5HT2JLlN7jDMi8kbhEL7 c1KWbub8UlZU3bFQNTeBTNGtiS598k/pGyQY0qW9vVsXuRwRpTO410hSuAxNhDnVaUg0L2 i4CZIbReMAI1Xg6tMK9lMLgG4xQHdcQX7Hf/vAvlVEb5QFbKEa3NGhzJZomagCiZra632u ff1QUy2mhXLagjUiY+Vt/48wgdkhlEVtscc7uAc4HYUgWHtaTN5CWiRAzcPjMgatq7WfZs IFNxK3i+2SjAcmK56OJJMLbAxnehEvKGbkgV02OEM2oStoY3rclVPJvR+SBnBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764877706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2nqQsD8EbMRO0yFdmoWxYcU52YYmimrsEt0VpQx3Ks=; b=RjtfND0u2CgPUMQn25czrPiJViuQoIVR4h8scN1sLhKBSMFEvQUgOkYd19h3NjnzS9nAzq P1kn4CqEkLWQYFc0VR33DtNt2RrNn4OS83kd06tOTRhswvuUMioGvrvplMJpFABm8ZXxSp VdB8o1Do4qd5HbEyvoqZgxg7Y+aN5HuWyS4D53wbOJlzi0B67R+7OtPITEg5OgZqyu+DgM IhaTQjTJmewC//pQj1JCzNDkQmJOTerDZRhu5jEiKtX0wRowy08sbt+Splb/wVvN8/wf5J +P4+cLbyxUP6BOk7t4R+opcIxTvc/f+b/0+cWBVn0XIjxFk9QPl3QjTdeyNArg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764877706; a=rsa-sha256; cv=none; b=dNKnXPC87ALqXAJ1mwLpNzfPKkk3O/5BWAAdLy3Ho+GRX2q4WxXyqbP3HpQuXhwl0xsCGz Mq5gACWwd1qd4pZXiTkDmSG3L4cm2tBn26u6/O0ws5JgH9EWhsGLwDNFIgkJ0QS9ll15Fj Yb252wxuG14z5Kp65Zgy13X7yeYr//E5dqWWX6UPpCgYaKnTln7uzG/z9jt76QvMntlAvk tyuicveLwwEXUQ1yFIUROk7HwgUsPbRZL4hApg86mPjxpfid0PEI5NnDl/fD+mlnsezsQw 3+zT9JQUJ52KkWpfDhq19DFycic+W+D/y7HAKigWtWeFmIdQX3NG6+FqFA7HJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMlRt3qx1zf87 for ; Thu, 04 Dec 2025 19:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 250e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 19:48:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 97939604f447 - main - git-arc: Add patch -b option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97939604f447de0d06e6cc2c15f19c6f7be30cd2 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 19:48:26 +0000 Message-Id: <6931e58a.250e0.20996fbb@gitrepo.freebsd.org> The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=97939604f447de0d06e6cc2c15f19c6f7be30cd2 commit 97939604f447de0d06e6cc2c15f19c6f7be30cd2 Author: Joseph Mingrone AuthorDate: 2025-12-01 23:23:37 +0000 Commit: Joseph Mingrone CommitDate: 2025-12-04 19:45:05 +0000 git-arc: Add patch -b option With the new patch -b option, switch to a new branch before applying changes from Differential revisions. While here, do some minor clean-up: - Fix a check to determine whether `arc patch` ran successfully. - Always ensure at least one argument is supplied to `git arc patch`. Sponsored by: The FreeBSD Foundation Reviewed by: imp, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54024 --- tools/tools/git/git-arc.sh | 58 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 8507d96fda63..98d29809d636 100755 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -59,7 +59,7 @@ Usage: git arc [-vy] Commands: create [-l] [-r [,...]] [-s subscriber[,...]] [|] list | - patch [-c] [ ...] + patch [-bc] [ ...] stage [-b branch] [|] update [-l] [-m message] [|] @@ -75,8 +75,10 @@ Description: create -- Create new Differential revisions from the specified commits. list -- Print the associated Differential revisions for the specified commits. - patch -- Try to apply a patch from a Differential revision to the - currently checked out tree. + patch -- Apply patches from Differential revisions. By default, patches + are applied to the currently checked-out tree, unless -b is + supplied, in which case a new branch is first created. The -c + option commits the applied patch using the review's metadata. stage -- Prepare a series of commits to be pushed to the upstream FreeBSD repository. The commits are cherry-picked to a branch (main by default), review tags are added to the commit log message, and @@ -146,6 +148,11 @@ Examples: $ git arc patch -c D12345 + Apply the patches in reviews D12345 and D12346 in a new branch, and commit + them using the review titles, summaries and authors. + + $ git arc patch -bc D12345 D12346 + List the status of reviews for all the commits in the branch "feature": $ git arc list main..feature @@ -567,6 +574,26 @@ find_author() echo "${a}" } +patch_branch() +{ + local base new suffix + + if [ $# -eq 1 ]; then + base="gitarc-$1" + else + base="gitarc-$(printf "%s-" "$@" | sed 's/-$//')" + fi + + new="$base" + suffix=1 + while git show-ref --quiet --branches "$new"; do + new="${base}_$suffix" + suffix=$((suffix + 1)) + done + + git checkout -b "$new" +} + patch_commit() { local diff reviewid review_data authorid user_data user_addr user_name @@ -626,15 +653,16 @@ patch_commit() gitarc__patch() { - local rev commit - - if [ $# -eq 0 ]; then - err_usage - fi + local branch commit rev + branch=false commit=false - while getopts c o; do + while getopts bc o; do case "$o" in + b) + require_clean_work_tree "patch -b" + branch=true + ;; c) require_clean_work_tree "patch -c" commit=true @@ -646,10 +674,18 @@ gitarc__patch() done shift $((OPTIND-1)) + if [ $# -eq 0 ]; then + err_usage + fi + + if ${branch}; then + patch_branch "$@" + fi for rev in "$@"; do - arc patch --skip-dependencies --nocommit --nobranch --force "$rev" + if ! arc patch --skip-dependencies --nobranch --nocommit --force "$rev"; then + break + fi echo "Applying ${rev}..." - [ $? -eq 0 ] || break if ${commit}; then patch_commit $rev fi From nobody Thu Dec 4 19:53:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMlYW5YjTz6Jcyt for ; Thu, 04 Dec 2025 19:53: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMlYW3Dyvz3t1n for ; Thu, 04 Dec 2025 19:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764877999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xn0x7x0WEP5zhh62HCq719MBkcCQ1qqYQvb3w8e9MkU=; b=qC5KeSbM0PgCiVpIv1l2IrpfA475bA3VZJzyhEeu7RAvAYKFHgc3MFTACNF2s2rss51+wX VP+FYZs5wpYe7kBo0p1HAmLQUUHhyU96Obe7G5cy9j2ny78VH0Lo8e8pYnkMLcxikK1pwC m8mWo/x+esjvKpXTq2fTmtnNCVR6yIilfHjUVacFNdla4Ez8vqQgmLET5htrXrPTrWa2Ow +pXPb94suenfCsmEDBmA/HLVsZWektO2GKwrjpyYlHJVnnj6BGdZcnVVmsoKGWmbcRt8fw Io6HLk7DcP1ijifL07qhOCwFmOcthuLzce15bFk0gFjQXDWSOLcHwvGG+mwY6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764877999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xn0x7x0WEP5zhh62HCq719MBkcCQ1qqYQvb3w8e9MkU=; b=pjIL7z9F4wLfMXNpeSQtEb4JnRNBKMOHuB8w4sV8kilBeeafCKFP6pgDqDN400rsCn6xGh UNP2B8sHbtwNpLaaO+2XbNmpl22YtX+zAAtcpc+QRw9M3zdowLNzzOz4WxeHqVl1dpL8ff iqsrSkOKT3ZMD3DZ4Svgf5d8Kiwe/jyGFRjxcBOW+2haPQnkM8tnR2ULqO+VNxAZRaMjpr cjaiyjoNkVoNLUY0QPNc4NdeEPOUUUjdfmBJXr/v0b5hIB7aIWVScrsBECkqMxsdThOsY6 vLC5dih+dpqqciz0rkI9P9uvkWmDf+Ga8iTCIpupEn1Wz3Md8Zs8cUIua6bhcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764877999; a=rsa-sha256; cv=none; b=tjsSd15ED2dW6YxNUvuk9fbmhDVud4hOamC5uZQKxw0vkCtmhhy4sd/tDZg1fDkGMBSS7a q+HYjqSLp8aPy5GucfeACxpgZChoLAmF3XoxxBFe5foPSqoDhRQ8LMPJWR5JPPNeZ+aMoF OocHMUB1EetYwyaqcUJe14Vr0hWhe3zDuN3+wLXNFUfPrmYxU0mbnc7qD621vnDuHrGjcv C2qsXRuBY7rAOwdY86LGWGRTou0ypPd35fZDIqphCkvPxNgo8d6pjX5cvM1p5IsBlfLsQg FPlRnOUbsyT1aeEnfULMr8XjCWrDl3DDAJGNP5Sjuw1z+GeBp+6DAjd4/f6Ahw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMlYW2pZtzf6K for ; Thu, 04 Dec 2025 19:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2415c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 19:53:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 431b3b224db2 - main - thread0: Stop calling thread0 "swapper" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 431b3b224db2a69d09c359ce1cfb37ba3da4705c Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 19:53:19 +0000 Message-Id: <6931e6af.2415c.264164fa@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=431b3b224db2a69d09c359ce1cfb37ba3da4705c commit 431b3b224db2a69d09c359ce1cfb37ba3da4705c Author: John Baldwin AuthorDate: 2025-12-04 19:52:59 +0000 Commit: John Baldwin CommitDate: 2025-12-04 19:52:59 +0000 thread0: Stop calling thread0 "swapper" Just leave it as "kernel". While here, replace "parked" with "-" (the typical wait channel for idle threads). Reviewed by: olce, kib, markj Differential Revision: https://reviews.freebsd.org/D54039 --- sys/kern/init_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 6612ac685936..a2898f75a795 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -336,7 +336,7 @@ mi_startup(void) * the need arises. */ for (;;) - tsleep(__builtin_frame_address(0), PNOLOCK, "parked", 0); + tsleep(__builtin_frame_address(0), PNOLOCK, "-", 0); } static void @@ -486,7 +486,7 @@ proc0_init(void *dummy __unused) schedinit(); /* scheduler gets its house in order */ /* - * Create process 0 (the swapper). + * Create process 0. */ LIST_INSERT_HEAD(&allproc, p, p_list); LIST_INSERT_HEAD(PIDHASH(0), p, p_hash); @@ -531,7 +531,7 @@ proc0_init(void *dummy __unused) LIST_INIT(&p->p_reaplist); strncpy(p->p_comm, "kernel", sizeof (p->p_comm)); - strncpy(td->td_name, "swapper", sizeof (td->td_name)); + strncpy(td->td_name, "kernel", sizeof (td->td_name)); callout_init_mtx(&p->p_itcallout, &p->p_mtx, 0); callout_init_mtx(&p->p_limco, &p->p_mtx, 0); From nobody Thu Dec 4 19:53:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMlYX6ndnz6JdDr for ; Thu, 04 Dec 2025 19:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMlYX4dGpz3syY for ; Thu, 04 Dec 2025 19:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764878000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fm5EQZ+IUUJDGVnxDj+ays2HKkOiRBZkc6uAtqy5MTs=; b=CUVYCi7WoUW554mTZC7O+FxzEC96pKOHWCq2PTQ0aMURS25QdUA7rdIThv4cHPAXEY6KuP ZMjXJ+QtPqxSS0v2Mt8hivmtAgdnYwH9RSGBorCB/4FD+mlB++8czyU9C7I05rofYUNkX2 uGqKyaf9juxBML3/0/KBPYyHu0j+4WjZmr3lhN09j3GGD2dVlKEi/aunX6NgtbcM4BrOqn 49mIlTMR3rkqtz0NJh74HdyL7EmSC2wpNiPwLKI4vSYLPewad9kHihp32OF6NlcsEqDh4y L3ULYcP2xMIURWNZuemKYluD8hSadusu/kgseE2iCzKp/+VbYjjwKlHe16/UOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764878000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fm5EQZ+IUUJDGVnxDj+ays2HKkOiRBZkc6uAtqy5MTs=; b=Yo1KpgUet410d3CZgbR6l2HbNoKXABDE6LkN5zhZrqmWXoPnxxVm7bm0coFXXak6nDNxlR H3gX76H0njfV1S3ctlKwU56z4LAON00jSete3vcL8LnOtzg2gM0dBRRFhMLZA0IanyczPb NQhIilsQ0zODGoJCNsyiOJtP91EW8UseZYsSZMqTq6l+jsOu4bIr4ZKerbpv8PKFcKTsxt j53D12aZ9QcfzZC0Dw/bOPaP769DfRXXfEZr54GSlzN3MWF0bmCWNKuil+UhCYHwoQNez6 4eR1w9ZSaCYhdj759ZysoGFaVaHJzj5A2stMAfUbv335RSuMWo0DlJa73gL/lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764878000; a=rsa-sha256; cv=none; b=AtpslSR7S1dBn4g5XssHKe12QjYiL0ibQlPuNN+wTh4striesDSNx011h4kujOQebG7O07 BFy9bcOhc7NHFrPv3peRhWBOmtlgGPEtCrKfkm5sNKwqt4BOu7rT9KJe470ieF7ZjfC7+4 PwphY0qFYJq04PBd8KYQRi5Mfx4P/nIAeNJbpIbZF7miuo1KyFnsW9Xiorig9GpI+WHCHp VyEl5zCVWWpDHLGdtB1QnnP0AicW6jtXoLDlz+hmZIpMhTPka+zJdUao0d/6CyQuOWhNRJ mJYrTREDBKYm3j2j1RMvJ7qVw5FtvnLpcbJ08Tskw6cHh1Auw51TS5AS6zq8Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMlYX3gM3zdwJ for ; Thu, 04 Dec 2025 19:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 256ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 19:53:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f6910b09a230 - main - sys: Remove/update references to the swapper process in various comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6910b09a2302df9b3b1666deb89037c831a4e4c Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 19:53:20 +0000 Message-Id: <6931e6b0.256ae.5c527950@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f6910b09a2302df9b3b1666deb89037c831a4e4c commit f6910b09a2302df9b3b1666deb89037c831a4e4c Author: John Baldwin AuthorDate: 2025-12-04 19:52:59 +0000 Commit: John Baldwin CommitDate: 2025-12-04 19:52:59 +0000 sys: Remove/update references to the swapper process in various comments Reviewed by: olce, markj Differential Revision: https://reviews.freebsd.org/D54051 --- sys/arm/arm/pmap-v6.c | 2 +- sys/i386/i386/pmap.c | 2 +- sys/sys/proc.h | 2 +- sys/sys/sleepqueue.h | 5 +---- sys/vm/vnode_pager.c | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 6a0ece1e4d98..d67267bba4e2 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -2158,7 +2158,7 @@ SYSCTL_PROC(_vm, OID_AUTO, kvm_free, ***********************************************/ /* - * Initialize the pmap for the swapper process. + * Initialize the pmap for proc0. */ void pmap_pinit0(pmap_t pmap) diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 1cf0867d57c3..2f9e6ccf43a8 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -2026,7 +2026,7 @@ pmap_abort_ptp(pmap_t pmap, vm_offset_t va, vm_page_t mpte) } /* - * Initialize the pmap for the swapper process. + * Initialize the pmap for proc0. */ static void __CONCAT(PMTYPE, pinit0)(pmap_t pmap) diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 8c0729d3ec66..23b052e21063 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1081,7 +1081,7 @@ extern int allproc_gen; extern struct sx proctree_lock; extern struct mtx ppeers_lock; extern struct mtx procid_lock; -extern struct proc proc0; /* Process slot for swapper. */ +extern struct proc proc0; /* Initial kernel process. */ extern struct thread0_storage thread0_st; /* Primary thread in proc0. */ #define thread0 (thread0_st.t0st_thread) extern struct vmspace vmspace0; /* VM space for proc0. */ diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h index f28a7f75a50c..25b345f46a81 100644 --- a/sys/sys/sleepqueue.h +++ b/sys/sys/sleepqueue.h @@ -54,10 +54,7 @@ * be removed from a specified sleep queue using the sleepq_remove() * function. Note that the sleep queue chain must first be locked via * sleepq_lock() before calling sleepq_abort(), sleepq_broadcast(), or - * sleepq_signal(). These routines each return a boolean that will be true - * if at least one swapped-out thread was resumed. In that case, the caller - * is responsible for waking up the swapper by calling kick_proc0() after - * releasing the sleep queue chain lock. + * sleepq_signal(). * * Each thread allocates a sleep queue at thread creation via sleepq_alloc() * and releases it at thread destruction via sleepq_free(). Note that diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 244aa31ea703..9693cb15f80d 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -1264,7 +1264,7 @@ vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count, * Force synchronous operation if we are extremely low on memory * to prevent a low-memory deadlock. VOP operations often need to * allocate more memory to initiate the I/O ( i.e. do a BMAP - * operation ). The swapper handles the case by limiting the amount + * operation ). The swap pager handles the case by limiting the amount * of asynchronous I/O, but that sort of solution doesn't scale well * for the vnode pager without a lot of work. * From nobody Thu Dec 4 19:53:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMlYZ27Mkz6Jd2P for ; Thu, 04 Dec 2025 19:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMlYY4zSwz3t8K for ; Thu, 04 Dec 2025 19:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764878001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i6CgtithruEp7sNjgIDAvEZxCnhPl8uBOKdONhzB6F8=; b=AzvwIxGwDNxP2qxiuCtsn3lVEF/WlFoUxF+ZA2QrD3rrD4WtQqIMiqaftih6OgAampyYQW x/MiWr6qKYtjv559X9v7tgNuS07yIJInAGTzJyd2nfoQ9P0WOCgba+NB2vPWrbDrMJjPtf Gs4jdKF8TC7aJrttsabzM7gJOu2b4vueoaCm79X/Y3oS6H8oliWrrOwW44xCuxTpbiFS09 6RCwz5ArLWTdg6WgwQVLJgFE8C65WvvVSyrZntWfnbwGW8y+d+t5ZqsR/bE2kIK4K6h41O +fSjMjHow3MGtLCe5YfLNIHiYH6io1hn9JEcJLuWlSXdKVQrelell2KdllgYvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764878001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i6CgtithruEp7sNjgIDAvEZxCnhPl8uBOKdONhzB6F8=; b=w6x7wR4bzc84MlEWD5O2rgpXrVvhHl49bRxUoygd2G00g8bK5jz89Z2i+bdbTcLH6hBFQW 608wcIL7FAonWjRfLYX4Vh/YH1S7SMrwjpEaBb3AAq6O60dwDwVMn1NdN5WGbxtKnqaS9B xTlL7KslBXgHIIP1Uxf0abN9uBhyNr511w5BZYsv9zpFRXptLGEwwcFO+GnhJ8g/29y+bK 2Q5Z3INL01feB6xezVMwtRdjfSYwBr4TmYH4E8O7Vq8GAJHxge3khiA3G9dDGvv4XwtA38 K6D80qUZgXqLKFzq2b5xf7AsuOr4EQlNeNE9un84Auxnw6/F5i5sqf+GGg6SAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764878001; a=rsa-sha256; cv=none; b=ZEYboxt6ZPHE7FLEgiCi4EcuVRhqC+K+LUo8wCK7sIsoA1DfqOMBX6vYn4J33Hm0EEof42 NUBwqRuljDPVdVUUDz22JPYOGR6MRry0ZX+12AnMZDp8upbcjBJIXK61flgSxEOhJiQl+A ffjdhiT7WFMPRa5guBV2nFiD9jwnCgWMlQk1KzTP32fSZj6x9eD3g3R4IdG4eDMdzoKmPk cYPk79BGuQHv60YjmcvnOA4ErnKNDcOuQLCbHrWnibd7Jbl8dPQ4igXbJf1I6W1jobdk58 kc+EHLmxf7wCzYooeMyyqDg9Wyhx931LdGK4HNNCXUU/1LFuQFVB0cGAjFh2Ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMlYY4X35zdwK for ; Thu, 04 Dec 2025 19:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23bca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 19:53:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 61ffc1bf8c42 - main - MAC: Rename mac_cred_create_swapper to mac_cred_create_kproc0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61ffc1bf8c4288c18d0ef86877e2558fa7ae3e13 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 19:53:21 +0000 Message-Id: <6931e6b1.23bca.f19ba43@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=61ffc1bf8c4288c18d0ef86877e2558fa7ae3e13 commit 61ffc1bf8c4288c18d0ef86877e2558fa7ae3e13 Author: John Baldwin AuthorDate: 2025-12-04 19:52:59 +0000 Commit: John Baldwin CommitDate: 2025-12-04 19:52:59 +0000 MAC: Rename mac_cred_create_swapper to mac_cred_create_kproc0 Reported by: markj Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D54052 --- sys/kern/init_main.c | 2 +- sys/security/mac/mac_cred.c | 4 ++-- sys/security/mac/mac_framework.h | 2 +- sys/security/mac/mac_policy.h | 4 ++-- sys/security/mac_biba/mac_biba.c | 4 ++-- sys/security/mac_lomac/mac_lomac.c | 4 ++-- sys/security/mac_mls/mac_mls.c | 4 ++-- sys/security/mac_partition/mac_partition.c | 4 ++-- sys/security/mac_stub/mac_stub.c | 4 ++-- sys/security/mac_test/mac_test.c | 8 ++++---- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a2898f75a795..3075b2224963 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -560,7 +560,7 @@ proc0_init(void *dummy __unused) audit_cred_kproc0(newcred); #endif #ifdef MAC - mac_cred_create_swapper(newcred); + mac_cred_create_kproc0(newcred); #endif /* Create sigacts. */ p->p_sigacts = sigacts_alloc(); diff --git a/sys/security/mac/mac_cred.c b/sys/security/mac/mac_cred.c index 5066de277176..b1239c3e7c65 100644 --- a/sys/security/mac/mac_cred.c +++ b/sys/security/mac/mac_cred.c @@ -132,10 +132,10 @@ mac_cred_associate_nfsd(struct ucred *cred) * processes and threads are spawned. */ void -mac_cred_create_swapper(struct ucred *cred) +mac_cred_create_kproc0(struct ucred *cred) { - MAC_POLICY_PERFORM_NOSLEEP(cred_create_swapper, cred); + MAC_POLICY_PERFORM_NOSLEEP(cred_create_kproc0, cred); } /* diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h index af827c33ee58..1233cd30f211 100644 --- a/sys/security/mac/mac_framework.h +++ b/sys/security/mac/mac_framework.h @@ -134,7 +134,7 @@ int mac_cred_check_setuid(struct ucred *cred, uid_t uid); int mac_cred_check_visible(struct ucred *cr1, struct ucred *cr2); void mac_cred_copy(struct ucred *cr1, struct ucred *cr2); void mac_cred_create_init(struct ucred *cred); -void mac_cred_create_swapper(struct ucred *cred); +void mac_cred_create_kproc0(struct ucred *cred); void mac_cred_destroy(struct ucred *); void mac_cred_init(struct ucred *); diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h index 66e489060804..f0a1f0863c96 100644 --- a/sys/security/mac/mac_policy.h +++ b/sys/security/mac/mac_policy.h @@ -167,7 +167,7 @@ typedef int (*mpo_cred_check_visible_t)(struct ucred *cr1, typedef void (*mpo_cred_copy_label_t)(struct label *src, struct label *dest); typedef void (*mpo_cred_create_init_t)(struct ucred *cred); -typedef void (*mpo_cred_create_swapper_t)(struct ucred *cred); +typedef void (*mpo_cred_create_kproc0_t)(struct ucred *cred); typedef void (*mpo_cred_destroy_label_t)(struct label *label); typedef int (*mpo_cred_externalize_label_t)(struct label *label, char *element_name, struct sbuf *sb, int *claimed); @@ -738,7 +738,7 @@ struct mac_policy_ops { mpo_cred_check_setresgid_t mpo_cred_check_setresgid; mpo_cred_check_visible_t mpo_cred_check_visible; mpo_cred_copy_label_t mpo_cred_copy_label; - mpo_cred_create_swapper_t mpo_cred_create_swapper; + mpo_cred_create_kproc0_t mpo_cred_create_kproc0; mpo_cred_create_init_t mpo_cred_create_init; mpo_cred_destroy_label_t mpo_cred_destroy_label; mpo_cred_externalize_label_t mpo_cred_externalize_label; diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index aac7a0545ab8..a3304e761423 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -912,7 +912,7 @@ biba_cred_create_init(struct ucred *cred) } static void -biba_cred_create_swapper(struct ucred *cred) +biba_cred_create_kproc0(struct ucred *cred) { struct mac_biba *dest; @@ -3574,7 +3574,7 @@ static struct mac_policy_ops mac_biba_ops = .mpo_cred_check_visible = biba_cred_check_visible, .mpo_cred_copy_label = biba_copy_label, .mpo_cred_create_init = biba_cred_create_init, - .mpo_cred_create_swapper = biba_cred_create_swapper, + .mpo_cred_create_kproc0 = biba_cred_create_kproc0, .mpo_cred_destroy_label = biba_destroy_label, .mpo_cred_externalize_label = biba_externalize_label, .mpo_cred_init_label = biba_init_label, diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index 23a996469bc0..8b0473151690 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -1008,7 +1008,7 @@ lomac_cred_create_init(struct ucred *cred) } static void -lomac_cred_create_swapper(struct ucred *cred) +lomac_cred_create_kproc0(struct ucred *cred) { struct mac_lomac *dest; @@ -2910,7 +2910,7 @@ static struct mac_policy_ops lomac_ops = .mpo_cred_check_relabel = lomac_cred_check_relabel, .mpo_cred_check_visible = lomac_cred_check_visible, .mpo_cred_copy_label = lomac_copy_label, - .mpo_cred_create_swapper = lomac_cred_create_swapper, + .mpo_cred_create_kproc0 = lomac_cred_create_kproc0, .mpo_cred_create_init = lomac_cred_create_init, .mpo_cred_destroy_label = lomac_destroy_label, .mpo_cred_externalize_label = lomac_externalize_label, diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c index 54a32b6d564d..fa6643038326 100644 --- a/sys/security/mac_mls/mac_mls.c +++ b/sys/security/mac_mls/mac_mls.c @@ -875,7 +875,7 @@ mls_cred_create_init(struct ucred *cred) } static void -mls_cred_create_swapper(struct ucred *cred) +mls_cred_create_kproc0(struct ucred *cred) { struct mac_mls *dest; @@ -3203,7 +3203,7 @@ static struct mac_policy_ops mls_ops = .mpo_cred_check_visible = mls_cred_check_visible, .mpo_cred_copy_label = mls_copy_label, .mpo_cred_create_init = mls_cred_create_init, - .mpo_cred_create_swapper = mls_cred_create_swapper, + .mpo_cred_create_kproc0 = mls_cred_create_kproc0, .mpo_cred_destroy_label = mls_destroy_label, .mpo_cred_externalize_label = mls_externalize_label, .mpo_cred_init_label = mls_init_label, diff --git a/sys/security/mac_partition/mac_partition.c b/sys/security/mac_partition/mac_partition.c index 2f0189b79ace..7c51f951be31 100644 --- a/sys/security/mac_partition/mac_partition.c +++ b/sys/security/mac_partition/mac_partition.c @@ -159,7 +159,7 @@ partition_cred_create_init(struct ucred *cred) } static void -partition_cred_create_swapper(struct ucred *cred) +partition_cred_create_kproc0(struct ucred *cred) { SLOT_SET(cred->cr_label, 0); @@ -298,7 +298,7 @@ static struct mac_policy_ops partition_ops = .mpo_cred_check_visible = partition_cred_check_visible, .mpo_cred_copy_label = partition_cred_copy_label, .mpo_cred_create_init = partition_cred_create_init, - .mpo_cred_create_swapper = partition_cred_create_swapper, + .mpo_cred_create_kproc0 = partition_cred_create_kproc0, .mpo_cred_destroy_label = partition_cred_destroy_label, .mpo_cred_externalize_label = partition_cred_externalize_label, .mpo_cred_init_label = partition_cred_init_label, diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c index a3b0dd01a76b..ac5d5b58e5db 100644 --- a/sys/security/mac_stub/mac_stub.c +++ b/sys/security/mac_stub/mac_stub.c @@ -319,7 +319,7 @@ stub_cred_create_init(struct ucred *cred) } static void -stub_cred_create_swapper(struct ucred *cred) +stub_cred_create_kproc0(struct ucred *cred) { } @@ -1720,7 +1720,7 @@ static struct mac_policy_ops stub_ops = .mpo_cred_check_visible = stub_cred_check_visible, .mpo_cred_copy_label = stub_copy_label, .mpo_cred_create_init = stub_cred_create_init, - .mpo_cred_create_swapper = stub_cred_create_swapper, + .mpo_cred_create_kproc0 = stub_cred_create_kproc0, .mpo_cred_destroy_label = stub_destroy_label, .mpo_cred_externalize_label = stub_externalize_label, .mpo_cred_init_label = stub_init_label, diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c index 890b8328055e..c447eeef010d 100644 --- a/sys/security/mac_test/mac_test.c +++ b/sys/security/mac_test/mac_test.c @@ -416,13 +416,13 @@ test_cred_create_init(struct ucred *cred) COUNTER_INC(cred_create_init); } -COUNTER_DECL(cred_create_swapper); +COUNTER_DECL(cred_create_kproc0); static void -test_cred_create_swapper(struct ucred *cred) +test_cred_create_kproc0(struct ucred *cred) { LABEL_CHECK(cred->cr_label, MAGIC_CRED); - COUNTER_INC(cred_create_swapper); + COUNTER_INC(cred_create_kproc0); } COUNTER_DECL(cred_destroy_label); @@ -3074,7 +3074,7 @@ static struct mac_policy_ops test_ops = .mpo_cred_check_visible = test_cred_check_visible, .mpo_cred_copy_label = test_cred_copy_label, .mpo_cred_create_init = test_cred_create_init, - .mpo_cred_create_swapper = test_cred_create_swapper, + .mpo_cred_create_kproc0 = test_cred_create_kproc0, .mpo_cred_destroy_label = test_cred_destroy_label, .mpo_cred_externalize_label = test_cred_externalize_label, .mpo_cred_init_label = test_cred_init_label, From nobody Thu Dec 4 21:26:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMnd73jDNz6JmHX for ; Thu, 04 Dec 2025 21:26: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMnd734Fnz48MK for ; Thu, 04 Dec 2025 21:26:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764883595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KeOnGe74QxHd2EQ9MpTXzAP9fvXxzdKGea+4+nh1Dzo=; b=bR8KbdHdLWndiPmpb/8GUHTdmgc7Crkm0FAVyWFBKIkPY8xw8oYmezjvGuJOIwai/Az+I+ zcCf3T1tOsE+6N44JHILX0oIMBWkPaXoMx0aFQofiVpF9ckH1PQyJnFFHXDclC8PORMgRm oWG+ExNlJCKGT3/bQdNrL4sU00bSKX1EvfcVNG1hIs4wTkKF2j1s6eC+sjG04jVQU/NGGX GEDwW1uNInhPUJIMfQ4KEHSdt2+r7dRwNwaU/NdoE4ttqoj2cWjKspOXdlI+E/PRCxOP/y tEBDWl4JjULDdmsJ9zZY66rN/7ry/VX+frRSirZGuNl+6Ray2KfER7y2hTkgIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764883595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KeOnGe74QxHd2EQ9MpTXzAP9fvXxzdKGea+4+nh1Dzo=; b=eSMo/rkD1WiqdK2EQ7YjbCteLRoGaeWTXO95BGkvRYRqL4VUmTzNfUM4H5AubrviPBaL2j +cbZaahcRGGJRymSsC892sXE5JPfVW6iAX55DUKhtfJMr6vlQ0uo92KMIUE4Jqwd/Ai+au r0TdkC4364v2kkj9D3TGAyOrZublWpZ4i5MKgQfGH8GsAwRYYeCqr93u48B2yGSHBLcgVA yAATxFdBDcIV2qIU06nybxq4auAZHYVIzqWB8QebIx5cbNOBO5BVgrZFK6OkDVpvjz9Dtz fI41DisdRZSUFi9GAxB99EGpzIigNAOE3HIUQr/etthDAeDuCZp9GQlW6hvUtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764883595; a=rsa-sha256; cv=none; b=K/kwp8RSVxJlsxA61NwF7tHBR7/mzabdM696pW3N5aHcV/teIrNQSzYlfuiTEbknzCHJgu t4ZX3PjfYNl494kb8Ql/P1ozLwNVee9u1Kz/7hwDH8gHEJYu/30GsYnm/ktlWpmJbcmWxO lJ1qC2NdjOeEZT/vZpb+bH0Sp8rkgh7XYqSSfjs89nxqMpeLrhhKtBlmfXItvNISNlNN7O Ds2P8c8XshaCrDsa9bGKxP44OwDh1jJsgBwSR5vjiU/TAzdQq/9cp5XvJEzR57eQNlO8QV CaprMU04YvuyeoIua6rFX9yUWzm4srUxZyEa4vxoHeqSTMutOPHwWhFiyOgDiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMnd72Vb5zhqt for ; Thu, 04 Dec 2025 21:26:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cee3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 21:26:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rene Ladan Subject: git: 8102307c7bf7 - main - misc: retire tcberner from portmgr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8102307c7bf76b94dd452e479670210d53331b3a Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 21:26:35 +0000 Message-Id: <6931fc8b.2cee3.6bd141c1@gitrepo.freebsd.org> The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/src/commit/?id=8102307c7bf76b94dd452e479670210d53331b3a commit 8102307c7bf76b94dd452e479670210d53331b3a Author: Rene Ladan AuthorDate: 2025-12-04 21:26:06 +0000 Commit: Rene Ladan CommitDate: 2025-12-04 21:26:29 +0000 misc: retire tcberner from portmgr Hat: portmgr --- share/misc/organization.dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/organization.dot b/share/misc/organization.dot index 73e879578dd7..c9b6bae1b793 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -30,7 +30,7 @@ doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\nbcr, gabor, gjb, hrs,\nblackend, ryusuke, wblock"] pkgmgr [label="Package Management Team\npkgmgr@FreeBSD.org\nantoine, bdrewery"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] -portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, dvl, mat,\npizzamig, rene, tcberner"] +portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, dvl, mat,\npizzamig, rene"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nrene"] re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib,\nblackend, delphij, cperciva"] secteam [label="Security Team\nsecteam@FreeBSD.org\ndelphij,\ndes, markj,\nemaste,\ngjb, gordon,\noshogbo, philip"] From nobody Thu Dec 4 23:28:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMrKn1gqKz6JwWZ for ; Thu, 04 Dec 2025 23:28: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMrKm6QPnz4NJs for ; Thu, 04 Dec 2025 23:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764890908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L0tVdJLNRBgALsvX1fUuTE5BATBg1GApviLhSyoTD4o=; b=GTqWH5MMO2pYKrQRVFTXAvPtaFALrnGTiJN27/ixRl6jv3CRf5z0oasAOECR2SzVMBUywj Zl8RIwmZjHRWf3llOY0kv8Ny+Y10dcV1YZ8IoipNr3UC9Q+/VGt6EacjK5FCrEJQjBmdQw uWHNwEXk5rga30wlujXVAXSmRNPOBQip5VrElH818Yl3V+UJ2ZARs2WsKQGBZ4SOxn/V/j I4Xbwx5GadDBS3Fgb2EYdydp0TVnHX04hoEn7BC5d87PfJTD69YSVt3inHaiaBxAcIkOX4 xTdksUFAg7oCvQhtXZz6avHQ9bl19z64WmE7VRDCKtM54HbHcnTWu2vtxQmykA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764890908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L0tVdJLNRBgALsvX1fUuTE5BATBg1GApviLhSyoTD4o=; b=h+xKUiCUixu2Vkhq+sXbO2LVyEic7OSpqXZvlPn/7KIO/7Y1XMbY087Dqes5ePt2gX4i1M 91fDVkzBbMm9S/u9MyEFTOS5xrRMHdWYFTxXDocdRZP1Kf7Rbm5XZq63Gv3623LLdpvVcs 0rwJh5RK2qW5XrxQlcBOKI0BH3W9fkqhWnw1ZRHp0oVSgz5255d9VIId2LxshMrQlVqUAo ry/FIDNOknRW7cs2ZUe3/y+Nb4x4tRmajAnqJme2jsbJoHbVxo9LDuffbAhEH7N9osVbAE 5lfyzSqbNZdRM/kuHB57ZienPNLRa553nMeM4gny+nuHYTzw4TIk/eseHk1IXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764890908; a=rsa-sha256; cv=none; b=el+xyY5zuNwKfJbsReV8rxXRCLln7ywfQuLSESI5GzihwgRaiq3PrKqYbfnuuVFjYgGRis gQ49d0XXfonpvwmFf5KQ6zhPjoqXEcid/Wa0ewb9wAFlrtIka006j19jGbJEa4bE7wyUAB oOAMjR0+mqEDG2OODyBd/TRTkcCCyNh22ViUFkiImBXZuMw0nbwIHSmUA9FxbF9uuNVVsU WttVQUtP/eZ4iFDyEY7Lsru+fQCywmRIbrJab2AuFRR+Oc0f0rtd1Ij/+qTfbZ15RUJ/F8 WmQMOA3A46y40G4AYxuqfctp84+M2oGQxnfR1U+W7UJ+wOy2DQa/SdTvxalOJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMrKm5fKZzlZb for ; Thu, 04 Dec 2025 23:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 974e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Dec 2025 23:28:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: fc88be257e30 - main - Revert "stddef.h: add unreachable() for C23 compliance" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc88be257e30c3e3c01f25ec3a3a6e7933b40c54 Auto-Submitted: auto-generated Date: Thu, 04 Dec 2025 23:28:28 +0000 Message-Id: <6932191c.974e.6390bbba@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=fc88be257e30c3e3c01f25ec3a3a6e7933b40c54 commit fc88be257e30c3e3c01f25ec3a3a6e7933b40c54 Author: Robert Clausecker AuthorDate: 2025-12-04 23:25:10 +0000 Commit: Robert Clausecker CommitDate: 2025-12-04 23:25:10 +0000 Revert "stddef.h: add unreachable() for C23 compliance" Seems like a number of ports are *really* unhappy with this new macro. These ports will have to be fixed and the patch reworked to perhaps not affect C++ (see D54041). A general discussion on how we expose new language features may also need to take place. Reported by: many people Approved by: markj (mentor) This reverts commit b381d0980221b476cadbef862a8e5973d675fb7a. --- include/stddef.h | 4 -- share/man/man3/Makefile | 3 +- share/man/man3/assert.3 | 5 +-- share/man/man3/unreachable.3 | 90 -------------------------------------------- 4 files changed, 3 insertions(+), 99 deletions(-) diff --git a/include/stddef.h b/include/stddef.h index 2ac8e9fe3f77..3ba9a9946b01 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -61,10 +61,6 @@ typedef __max_align_t max_align_t; #endif #endif -#if __ISO_C_VISIBLE >= 2023 -#define unreachable(x) __unreachable(x) -#endif - #ifndef offsetof #define offsetof(type, field) __builtin_offsetof(type, field) #endif diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 3fd819814f77..8e4aadc460a6 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -36,8 +36,7 @@ MAN= alloca.3 \ sysexits.3 \ tgmath.3 \ timeradd.3 \ - tree.3 \ - unreachable.3 + tree.3 MLINKS= arb.3 ARB8_ENTRY.3 \ arb.3 ARB8_HEAD.3 \ diff --git a/share/man/man3/assert.3 b/share/man/man3/assert.3 index cbaedb49010a..f219aa1d6743 100644 --- a/share/man/man3/assert.3 +++ b/share/man/man3/assert.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 27, 2025 +.Dd April 20, 2021 .Dt ASSERT 3 .Os .Sh NAME @@ -118,8 +118,7 @@ constraint and includes the provided string literal: If none is provided, it only points at the constraint. .Sh SEE ALSO .Xr abort2 2 , -.Xr abort 3 , -.Xr unreachable 3 +.Xr abort 3 .Sh STANDARDS The .Fn assert diff --git a/share/man/man3/unreachable.3 b/share/man/man3/unreachable.3 deleted file mode 100644 index 9dd7da806d42..000000000000 --- a/share/man/man3/unreachable.3 +++ /dev/null @@ -1,90 +0,0 @@ -.\" -.\" Copyright (c) 2025 Robert Clausecker -.\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" -.Dd November 27, 2025 -.Dt UNREACHABLE 3 -.Os -.Sh NAME -.Nm unreachable -.Nd the unreachable macro -.Sh SYNOPSIS -.In stddef.h -.Fd #define unreachable() -.Sh DESCRIPTION -If the -.Fn unreachable -macro is reached during execution, behavior is undefined. -This can be useful to hint to the compiler that some invariant is guaranteed to -hold or that some case cannot occur. -.Sh EXAMPLES -Suppose a floating-point number -.Va x -is to be classified using the -.Xr fpclassify 3 -macro and a different action is to be taken based on the result of the -classification. -As the set of possible return values is known, the -.Fn unreachable -macro can be used to hint to the compiler that it can omit checks for -other possible return values: -.Bd -literal -offset 3n -#include -#include -#include - -void print_classification(double x) -{ - printf("%f: ", x); - - switch (fpclassify(x)) { - case FP_INFINITE: - puts("infinite"); - break; - - case FP_NAN: - puts("not a number"); - break; - - case FP_NORMAL: - puts("normal"); - break; - - case FP_SUBNORMAL: - puts("subnormal"); - break; - - case FP_ZERO: - puts("zero"); - break; - - default: - unreachable(); - } -} -.Ed -.Sh SEE ALSO -.Xr assert 3 -.Sh STANDARDS -The -.Fn unreachable -macro conforms to -.St -isoC-2023 . -.Sh HISTORY -A -.Dv /*NOTREACHED*/ -conventional comment was supported by the historical -.Xr lint 1 -utility to suppress warnings about unreachable statements during static -analysis. -The -.Fn unreachable -macro was added in -.Fx 15.1 -based on the earlier private -.Fn __unreachable -macro for compliance with -.St -isoC-2023 . -.Sh AUTHOR -.Ah Robert Clausecker Aq Mt fuz@FreeBSD.org From nobody Fri Dec 5 02:44:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dMwgn1PcRz6KFWG for ; Fri, 05 Dec 2025 02:44: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMwgn0ppyz3YPc for ; Fri, 05 Dec 2025 02:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764902661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FZ8vdpnpYp7qU03cKety/7QZVYNI0BbIOah759ig/E=; b=TZeszKXf8wtDPuM4i3DOAhWcR72zMfGHghmjFQqZ4Z/eAaxYzc7/co4qvJFMaPTEiy/2sE Qqzj+vK2UTPugvHT7PrXDbghEZ2Rf5wn00DU1gWmg3/ty3kWYphWyZmVKl1vzvFkYcKjY/ lcj3qhw4IM4+RZ4XjecG8QB6v1dLAvB/TFE+T5ecWkkrgiXyuRohyL5/PuuHSicIy9LANy GLYdfs9twtjjjupKpe9v7Wim+tZzDu+lNsCc97mVg+bOi2TXYIohNC1S5FBPqGfCuXLdz0 dKKnLyoYiL9355TFE77zutuNSUW0nembgA71zMhPhdlXU4nRRHFtJt7AkmjKgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764902661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FZ8vdpnpYp7qU03cKety/7QZVYNI0BbIOah759ig/E=; b=Xi/97bLKWxP1bfcRpyYpu8DhzCarIGpUYgX3XLdiQR1RA5wlqdCmP8ReflbR6H5Of8J2/P U9B4vA7gVL+eFGXAThwBpOq+I8c8qbLTGGPZaYhbWoV7XF/fJ0x+l61e4v48Lsex/ViB2t DnvOyQp8OZzw8XQqjGNrHUMRIUsMk/CtI2wQsGiHOFs5FyclFeZxO39CKKRC4H3NGxwobH fYVlLYAo3VLbxJL1FYtAY7lAkBodVWjiT1BGtOPXYMwXpqUkGraODb0rIB6oPpT7QCPl5U 6Tn+FoFWSqYcfYJunfkBU+A+veWavJ/y0f3UW0qYDmfGlZt2OtPYe/ds7XIMdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764902661; a=rsa-sha256; cv=none; b=wqeNpyrZMAfV3TC2c1murxqpfGN9F/wzox6BiAnYKf0l0oLspDY2Clo7rn39s6W9bfJ4Rb 3ed0iAq1SKx2LHzvJmmkOVgQcbw3tygDrvEwl0tYQacPPBAfvlIX2JA/aXCVCObmbROM/A 6AjEZ2qwKSurwmp5MYZrxr5XHfJn7DJbLOR0e7SeJvwOzeDvMLwSwRhdoTECQKhQwl3xF1 ZkuO51bJnb5mgsdZXU13mZRbJCiLjd/q+EbJ6fh7lxyP8JM3LPPmFQeP1qUhbu64iU9ICj 2J9SSZX0fv7i9EVZvm8izZeqvdW87CCEJCi5xd7vbCNv+nxOllsSX4FxKT9cTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dMwgn09JNzrJY for ; Fri, 05 Dec 2025 02:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f4e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 02:44:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: ce8dc5b12451 - main - freebsd-base.7: Document the optional set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce8dc5b12451e9922ab827dfe3d10abcd6e85165 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 02:44:21 +0000 Message-Id: <69324705.2f4e5.6e4c66ff@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ce8dc5b12451e9922ab827dfe3d10abcd6e85165 commit ce8dc5b12451e9922ab827dfe3d10abcd6e85165 Author: Lexi Winter AuthorDate: 2025-12-05 02:43:51 +0000 Commit: Lexi Winter CommitDate: 2025-12-05 02:43:51 +0000 freebsd-base.7: Document the optional set MFC after: 3 days Reviewed by: ziaee, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54065 --- share/man/man7/freebsd-base.7 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index 07cd7ab5656c..9844d7d5063d 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd September 25, 2025 +.Dd December 4, 2025 .Dt FREEBSD-BASE 7 .Os .Sh NAME @@ -130,6 +130,20 @@ and .Xr nm 1 . This set also includes native development files (headers and static libraries) for all packages. +.It optional +Optional software which is not part of either the +.Sy devel +or +.Sy minimal +sets. +.It optional-jail +The equivalent of +.Sy optional +for systems running in a +.Xr jail 8 +environment. +This set excludes system functionality which typically does not work +or is not useful in a jail. .It lib32 32-compatibility libraries, for running 32-bit applications on a 64-bit host system. @@ -137,6 +151,13 @@ This set includes both runtime libraries and development files. .It base The complete base system, excluding tests, the system source code, and debugging symbols. +Installing the +.Sy base +set is equivalent to installing +.Sy minimal , +.Sy devel +and +.Sy optional . .It base-jail The equivalent of .Sy base @@ -145,6 +166,13 @@ for systems running in a environment. This set excludes system functionality which typically does not work or is not useful in a jail. +Installing the +.Sy base-jail +set is equivalent to installing +.Sy minimal-jail , +.Sy devel +and +.Sy optional-jail . .It src The system source tree for the userland and kernel, installed in .Pa /usr/src . From nobody Fri Dec 5 07:20:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dN2ny62r5z6KZ6f for ; Fri, 05 Dec 2025 07:20: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dN2ny58c8z3tbY for ; Fri, 05 Dec 2025 07:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764919206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TNfgX2DgLOCexmcRGg36P7R5ewEc0BO0v6VmRdlrveA=; b=ZOqnbxUqSluZPX/X6SmFuSFZSEadH1RKiw1HKpCYz99MQzXvLSUVXmcKOulCe1zqrl3gXb Obo/Lu2Icdx8r4/AHKGSH7CzlNHnCDMF3ir7NzfVC87HWyNMsu6hORTO2SH3MobDUlJ3eL mNFatXgoXQd09PZk9kUo9OPLoRIlCu+yY5jKbDWluAb/Aw/oLDwjIuGSM6dSEUMA5+MHpW /nrlsVAcik4Ffv8mMsgYfoDJLgT8eXuFPbo0ruLVs0sEU0esBtsNcOBqsR7NOhV/v/jLD2 rlgKZY8qU0KnwPIen3HIhPwRcyCeGvMcGyoXwyRfMI03VwvVzOtTSPJYBMZkLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764919206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TNfgX2DgLOCexmcRGg36P7R5ewEc0BO0v6VmRdlrveA=; b=MBAWnYSV8nwV7otRAaqnPxmGS/889YDLqyOeno+grasQ3l4YBpcM4+np6c13Y32eDLHe79 ymIMcrVB+WgJmEB0UfqV9d29lSeoxrs4EaONOxyGcJKBoL0cy1citHjplDpvf+kzXBT5n9 IVshgw7CJyF9/yhxSXBXNIvRv/VQA1gsKtKBRzVp0DpQlQaDM3WnDhNvh6xqkBdN9rpeQC Vg5nHB2Iz5MQgiGlpepcNdk1kxMg9w8XrUplhqU6ZuH/VYzEemU06TIRQEG8Ih9PoYyTfT aRVEz2LBJwRUY8L1z3UrOLvbiIwr8w2SWDWJjgZQ3aRHLLVJAhbC4B8Jjr4uHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764919206; a=rsa-sha256; cv=none; b=niBTve09Q3vsnvl5sWsfK7Y3bLooQQOCmY0FVOCjbIfRvx0X1xykzY/2sLmhtygXJFGpaA 4xArMgo3BezR7XUMWtfqxMudlntq852WR2k0T7Yr9BAKaruG8B/6RnI11Hltkuch7+KXiW wndbClTQbvet5vRUcEyG4TvDcYhjoa81dfpkMnmHG3c/b7ib+gDh7TId22fmx9ms0kJtsA YPshyZyBq6ddU3gdlVQLh2Ly6Kaf0zlU7JmYe5tvHytjHtiyaONwABPcRJ2HVNLYVkAq3w rCbRT8LS6GxUTUrnGp87FEqAe2wC2HmhmsilenKWYAxl3HH8zYeeJlifVr3Big== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dN2ny3l9Sz110t for ; Fri, 05 Dec 2025 07:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24223 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 07:20:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c3ea7bfc72b7 - main - cam: set reladr in scsi_read_capacity_16 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3ea7bfc72b712809228bb17b4c58b295b91920c Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 07:20:06 +0000 Message-Id: <693287a6.24223.13e1b3f@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c3ea7bfc72b712809228bb17b4c58b295b91920c commit c3ea7bfc72b712809228bb17b4c58b295b91920c Author: Warner Losh AuthorDate: 2025-12-05 07:11:18 +0000 Commit: Warner Losh CommitDate: 2025-12-05 07:13:22 +0000 cam: set reladr in scsi_read_capacity_16 The reladr field wasn't being set, so pmi and reladr args were nops. That's OK, because they are passed as 0 in the one place in the tree we use this. Sponsored by: Netflix --- sys/cam/scsi/scsi_all.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c index 168cd17d3965..0ba4fa0c8978 100644 --- a/sys/cam/scsi/scsi_all.c +++ b/sys/cam/scsi/scsi_all.c @@ -8001,9 +8001,9 @@ scsi_read_capacity_16(struct ccb_scsiio *csio, uint32_t retries, scsi_u64to8b(lba, scsi_cmd->addr); scsi_ulto4b(rcap_buf_len, scsi_cmd->alloc_len); if (pmi) - reladr |= SRC16_PMI; + scsi_cmd->reladr |= SRC16_PMI; if (reladr) - reladr |= SRC16_RELADR; + scsi_cmd->reladr |= SRC16_RELADR; } void From nobody Fri Dec 5 10:18:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dN6mK1B6Sz6Kmc7 for ; Fri, 05 Dec 2025 10:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dN6mJ6RqRz49qF for ; Fri, 05 Dec 2025 10:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764929936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7nJmXp/9TpJkPf0By7k/rar4VmPRQDYgGgKpaAZ2S8w=; b=Unbbc1CqQ+sxI8V5b/BE0lElQzFBiGg7JH4eXovfbJrBFQYMloMNBoAFOdEFCQQpzMMOij hZLbUeSReZ3R0hCG9Fvbss7jvWyM92Ih46HElwlv7IMR38wAp9DU5up91FCqHxNx4u2Bc0 JV6qA+25SVgS4eLMZRpNjQmVGXmsjHC/0X4InO4bwEUV+n1J0IC9WOGinzbJA5zi+CpAs/ 4yu6hAgbhH2oJQfGXXOomVxKqyAdONQ6qvh8zXjxCZX27wldC6g5qi2pY15K/WU6UuGwmv 0UcdipPjRd7W36AssQFQTShgVs9UZCxip/goHyvceK1stkKwREauZ60udJiwBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764929936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7nJmXp/9TpJkPf0By7k/rar4VmPRQDYgGgKpaAZ2S8w=; b=G+BySgrOQu+Nz76ok4CeWIG5iHGMDNEXw/a8SKQn5714ilTDdD8qkaha7QvUtktO+Xxyl6 tgZdN5EJ9XnPgYk9ZPr5K6a9AhdSrA3zJnp8uP5Nsa5REhqFerk80kxJ0n71GhmsTqAPAJ YYQEN564WY6ys2J7/olyeT3PJABz+eTQJFz3Fm7rVvM9rd9skoAEJpahJRpYImxvI2Ys9b FWOt7Wjzl6Scp3d2SpL5LUPkS6kJCzzKNLvd8JDefNDhSyRvn/AYyE6zNNCStEvF1gZtpi lkD2LPScwYEYKhFeJaKkwU2ZRT85hRYLNUfIadVw/7hQe0fHAM/inUKJwk5n8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764929936; a=rsa-sha256; cv=none; b=shgl7w3bEMLaEQTW5cGEZJqsi+UEZpma2fM/X0kNyIx36kk8gB4jLM4qrJRroXeDZApimA lxB5Ust0xinOEy+3xTtmWSW0CvwDwIE7/bB7D+LMeGkH6fWpBzFHIKP2mNy5ASxhYZwGst paOfHPMhU5Wv6PcYFzQTCHO0cQYLQRFOYzjn1XDUzqWzwIWJBkqrcTqjH8F3lkzA3UvlpU ak2wCqRoRZZZI3Vd04/ZfEdXkwF0ff5yOx4sgN9YPlUAMkHITMkLuXCSzkPPRfgm7RRY7Q xuzv6OEjlzpY4q6UvXegAxx+/YvE5aHFfgDxA2G3ZnhqK6WAUiM3hLA19YnqIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dN6mJ63Hxz15FY for ; Fri, 05 Dec 2025 10:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 357ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 10:18:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: a0dd6022391a - main - xhci: Add header values for Debug Capability (DbC) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0dd6022391aa33b035962d69965ef506cc46a20 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 10:18:56 +0000 Message-Id: <6932b190.357ad.1b27ce4@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=a0dd6022391aa33b035962d69965ef506cc46a20 commit a0dd6022391aa33b035962d69965ef506cc46a20 Author: Tom Jones AuthorDate: 2025-12-05 10:09:30 +0000 Commit: Tom Jones CommitDate: 2025-12-05 10:18:02 +0000 xhci: Add header values for Debug Capability (DbC) Add header values for xHCI debug capability. These values are defined in section 7.6 of xHCI Specification 1.2b (April 2023). Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53897 --- sys/dev/usb/controller/xhcireg.h | 121 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h index 3e3ad278bcba..c4f62586a0d0 100644 --- a/sys/dev/usb/controller/xhcireg.h +++ b/sys/dev/usb/controller/xhcireg.h @@ -211,6 +211,127 @@ #define XHCI_ID_EXT_MSI 0x0011 #define XHCI_ID_USB3_TUN 0x0012 +/* + * XHCI Debug Capability + * From Section 7.6 of xHCI April 2023 Revision 1.2b. + */ +#define XHCI_DCID 0x0000 + +#define XHCI_DCDB 0x0004 /* Doorbell */ +#define XHCI_DCDB_OUT 0x00000000 +#define XHCI_DCDB_IN 0x00000100 +#define XHCI_DCDB_INVAL 0x0000FE00 + +#define XHCI_DCERSTSZ 0x0008 /* Event Ring Segment Table size */ +#define XHCI_DCERSTBA_LO 0x0010 +#define XHCI_DCERSTBA_HI 0x0014 +#define XHCI_DCERDP_LO 0x0018 +#define XHCI_DCERDP_HI 0x001C + +#define XHCI_DCCTRL 0x0020 /* Debug Control */ +#define XHCI_DCCTRL_DCR 0x00000001 +#define XHCI_DCCTRL_DCR_GET(x) (((x) ) & 0x01) +#define XHCI_DCCTRL_LSE 0x00000002 +#define XHCI_DCCTRL_LSE_GET(x) (((x) >> 1) & 0x01) +#define XHCI_DCCTRL_HOT 0x00000004 +#define XHCI_DCCTRL_HOT_GET(x) (((x) >> 2) & 0x01) +#define XHCI_DCCTRL_HIT 0x00000008 +#define XHCI_DCCTRL_HIT_GET(x) (((x) >> 3) & 0x01) +#define XHCI_DCCTRL_DRC 0x00000010 +#define XHCI_DCCTRL_DRC_GET(x) (((x) >> 4) & 0x01) +#define XHCI_DCCTRL_MBS_GET(x) (((x) >> 16) & 0xFF) +#define XHCI_DCCTRL_ADDR_GET(x) (((x) >> 24) & 0x7F) +#define XHCI_DCCTRL_DCE 0x80000000 +#define XHCI_DCCTRL_DCE_GET(x) (((x) >> 31) & 0x01) + +#define XHCI_DCST 0x0024 /* Status */ +#define XHCI_DCST_ER 0x00000001 +#define XHCI_DCST_ER_GET(x) (((x) ) & 0x01) +#define XHCI_DCST_SBR 0x00000002 +#define XHCI_DCST_SBR_GET(x) (((x) >> 1) & 0x01) +#define XHCI_DCST_PORT_GET(x) (((x) >> 24) & 0xFF) + +#define XHCI_DCPORTSC 0x0028 /* Port Control */ +#define XHCI_DCPORTSC_CCS 0x00000001 +#define XHCI_DCPORTSC_CCS_GET(x) (((x) ) & 0x01) +#define XHCI_DCPORTSC_PED 0x00000002 +#define XHCI_DCPORTSC_PED_GET(x) (((x) >> 1) & 0x01) +#define XHCI_DCPORTSC_PR 0x00000010 +#define XHCI_DCPORTSC_PR_GET(x) (((x) >> 4) & 0x01) +#define XHCI_DCPORTSC_PLS_GET(x) (((x) >> 5) & 0x0F) +#define XHCI_DCPORTSC_PLS_U0 0x00 +#define XHCI_DCPORTSC_PLS_U1 0x01 +#define XHCI_DCPORTSC_PLS_U2 0x02 +#define XHCI_DCPORTSC_PLS_U3 0x03 +#define XHCI_DCPORTSC_PLS_DISABLED 0x04 +#define XHCI_DCPORTSC_PLS_RXDETECTED 0x05 +#define XHCI_DCPORTSC_PLS_INACTIVE 0x06 +#define XHCI_DCPORTSC_PLS_POLLING 0x07 +#define XHCI_DCPORTSC_PLS_RECOVERY 0x08 +#define XHCI_DCPORTSC_PLS_HOTRESET 0x09 +#define XHCI_DCPORTSC_SPEED_GET(x) (((x) >> 10) & 0x0F) +#define XHCI_DCPORTSC_CSC 0x00020000 +#define XHCI_DCPORTSC_CSC_GET(x) (((x) >> 17) & 0x01) +#define XHCI_DCPORTSC_PRC 0x00200000 +#define XHCI_DCPORTSC_PRC_GET(x) (((x) >> 21) & 0x01) +#define XHCI_DCPORTSC_PLC 0x00400000 +#define XHCI_DCPORTSC_PLC_GET(x) (((x) >> 22) & 0x01) +#define XHCI_DCPORTSC_CEC 0x00800000 +#define XHCI_DCPORTSC_CEC_GET(x) (((x) >> 23) & 0x01) +#define XHCI_DCCP_LO 0x0030 /* Context Pointer */ +#define XHCI_DCCP_HI 0x0034 +#define XHCI_DCDDI1 0x0038 /* Device Descriptor Info */ +#define XHCI_DCDDI2 0x003C /* Device Descriptor Info */ + +/* DbC CIC offset in uint32 */ +#define XHCI_DCDBCIC_STR0DESC_LO 0x0000 +#define XHCI_DCDBCIC_STR0DESC_HI 0x0001 +#define XHCI_DCDBCIC_MANUDESC_LO 0x0002 +#define XHCI_DCDBCIC_MANUDESC_HI 0x0003 +#define XHCI_DCDBCIC_PRODDESC_LO 0x0004 +#define XHCI_DCDBCIC_PRODDESC_HI 0x0005 +#define XHCI_DCDBCIC_SERIALDESC_LO 0x0006 +#define XHCI_DCDBCIC_SERIALDESC_HI 0x0007 +#define XHCI_DCDBCIC_DESCLEN 0x0008 +#define XHCI_DCDBCIC_STR0DESC_LEN_GET(x) (((x) >> 0) & 0xff) +#define XHCI_DCDBCIC_STR0DESC_LEN_SET(x) (((x) & 0xff) << 0) +#define XHCI_DCDBCIC_MANUDESC_LEN_GET(x) (((x) >> 8) & 0xff) +#define XHCI_DCDBCIC_MANUDESC_LEN_SET(x) (((x) & 0xff) << 8) +#define XHCI_DCDBCIC_PRODDESC_LEN_GET(x) (((x) >> 16) & 0xff) +#define XHCI_DCDBCIC_PRODDESC_LEN_SET(x) (((x) & 0xff) << 16) +#define XHCI_DCDBCIC_SERIALDESC_LEN_GET(x) (((x) >> 24) & 0xff) +#define XHCI_DCDBCIC_SERIALDESC_LEN_SET(x) (((x) & 0xff) << 24) + +#define XHCI_DCSTATUS(ctrl, portsc) \ + (XHCI_DCCTRL_DCE_GET(ctrl) << 4 | \ + XHCI_DCPORTSC_CCS_GET(portsc) << 3 | \ + XHCI_DCPORTSC_PED_GET(portsc) << 2 | \ + XHCI_DCPORTSC_PR_GET(portsc) << 1 | \ + XHCI_DCCTRL_DCR_GET(ctrl)) +#define XHCI_DCPORTSC_ACK_MASK \ + (XHCI_DCPORTSC_PED | \ + XHCI_DCPORTSC_CSC | XHCI_DCPORTSC_PRC | \ + XHCI_DCPORTSC_PLC | XHCI_DCPORTSC_CEC) + +#define XHCI_DCPORT_ST_OFF 0x00 +#define XHCI_DCPORT_ST_DISCONNECTED 0x10 /* DCE only */ +#define XHCI_DCPORT_ST_DISCONNECTED_RUNNING 0x11 /* XXX: DCE + DCR */ +#define XHCI_DCPORT_ST_DISABLED 0x18 /* DCE + CCS */ +#define XHCI_DCPORT_ST_RESETTING 0x1a /* DCE + CCS + PR */ +#define XHCI_DCPORT_ST_ENABLED 0x1c /* DCE + CCS + PED */ +#define XHCI_DCPORT_ST_CONFIGURED 0x1d /* DCE + CCS + PED + DCR */ + +#define XHCI_DC_MAXPACKETLEN 1024 +/* + * While Sec 7.6.3.2 describes Endpoint IDs should be 0 or 1, + * Intel chips use Device Context Index (Sec 4.5.1) instead. + */ +#define XHCI_DC_EPID_OUT 0 +#define XHCI_DC_EPID_IN 1 +#define XHCI_DC_EPID_OUT_INTEL 2 +#define XHCI_DC_EPID_IN_INTEL 3 +#define XHCI_DC_SLOT 1 + /* XHCI register R/W wrappers */ #define XREAD1(sc, what, a) \ bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \ From nobody Fri Dec 5 10:18:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dN6mH11Sgz6Kmht for ; Fri, 05 Dec 2025 10:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dN6mG6F68z49hF for ; Fri, 05 Dec 2025 10:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764929934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CjnzrdIXfcCbyDBAPhScjrHCQYs9hA2jbVkKdyBPmqM=; b=pBO7PSCk4VnLcrdEapI1xmcWipmkRYF6WH7mvjcQaJKP1GoIVRH6CSbCYsJJ3uzTk1Sq8L U0hmSUQGjCqAF4A045oc6tyWoFOt5nb4+IgaxeaJPjqnqLM51C0kZQEgGj0jukYLX8sPjH oWG7KSw/dLzA6R07sY3rI7Ay15Q6FUUI25kbdmIooydHlkSoktjV+LvbIRuotVbor5w7ll ZbIwCvOUpAUzSk/VhfIrb0Ke2w/ACVxNHLYh9Qbmnd7jj0QVnxlz9NEgSPPcdc9vc4sfvv iWgcv6wIFEqjYKGoFv9s1phfjQGpV8okl1ge6PzWNYhtZcumjLoVjmqAxGp7HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764929934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CjnzrdIXfcCbyDBAPhScjrHCQYs9hA2jbVkKdyBPmqM=; b=FyuOqP+yFXcDV0YqwuCi5iaZWVc+Xer+7HVmVclXfyCYh0AS83rj4RrATQ5iGNKlUenwXm YHrHwSaysX7/2QMjdFXxNj/vI2ETy9f4E3edH8pf92n+wwN/HCFDb7hY51qXBxUAzclbNN sXHhxXbJZcpE1ef/X4Hvc+2Vw5JQm3ZS+Jr0xyKzWEPLBX5oTusTyb6e6zS6VRFdqJdfLI YE1EcMJDsM1XkwAZiZ/9tZtlE9RC46Qh53R9SSVfj+7ntY92VexfnXOOPIUBZK2W/oabga A5cR7gGLpk8jJusbwKgj2g+aw3i3o1DJXruunjvueCRzV3+8IxfSgqvaj5hY1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764929934; a=rsa-sha256; cv=none; b=J09a0S8SHzvXowXM/m0YAB31cRTcxn40rdJeCaziEeqUiwvVNt1htYpg6ITi5xWQWc8y0e jYZVZmK4tkL/bjOGrBdvbn2Z4EJz6apBqFcYe16xAvDjS4lQL1kGwAFmSByF5uRT92Hp3s NcRx0sR9EPS27PKkRZtaWi2eNjtSIIjDnRowVymwLuNljBLIiFf51/7y58W2BjCDsx8woM iT81XtizAVnnoxmzLj2Ekqv0j2/Ot5KBgMC8V2Xlw2ZNxekiYNyk+p4P6U2YqRnuSkA+2T 9BWgpndANRgVNNH+HeV+mreioDeXeBmJi5VY5zZpsGj6Jgo4o/HNfTut1DvRyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dN6mG50wLz15CL for ; Fri, 05 Dec 2025 10:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35a1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 10:18:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: f327659e0450 - main - xhci: Add some Alder lake device ids List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f327659e045019ac36f32c952c9df723927c3da9 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 10:18:54 +0000 Message-Id: <6932b18e.35a1e.354b94@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=f327659e045019ac36f32c952c9df723927c3da9 commit f327659e045019ac36f32c952c9df723927c3da9 Author: Tom Jones AuthorDate: 2025-12-05 10:04:58 +0000 Commit: Tom Jones CommitDate: 2025-12-05 10:16:59 +0000 xhci: Add some Alder lake device ids Reviewed By: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52994 --- sys/dev/usb/controller/xhci_pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 820fb2f738a1..e5424163baa6 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -181,6 +181,8 @@ xhci_pci_match(device_t self) case 0x4b7d8086: return ("Intel Elkhart Lake USB 3.1 controller"); case 0x51ed8086: + case 0x54ed8086: + case 0x5fed8086: return ("Intel Alder Lake USB 3.2 controller"); case 0x5aa88086: return ("Intel Apollo Lake USB 3.0 controller"); From nobody Fri Dec 5 10:18:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dN6mJ0HRLz6Kmhw for ; Fri, 05 Dec 2025 10:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dN6mH5kJXz49fT for ; Fri, 05 Dec 2025 10:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764929935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7HWJCNsRYYjkKXz7abnpZslUT7Qfh1Z8bwj49Sm+Nus=; b=EpIZmu3x5oEcykUwnKm0W+e6h2LdKIYgAOwjHhZqd9FQoDDWzLq6dmNW3HExDfdmUZMUxP zk54bw+wr8wQQYGTZs0DGuyLGP7brbQQrqhDn4f0cGPC3Mk45fGEEmVFaw6WH6fP18y7eb M7o5rCuvHFeWF58eFG6vS8qE1j+8rOiNhzu/hbcPK93r86QtMzzIma7FDDfKPsBq25Wp4E LS6PRCEcPXy2741ONl8fuSfBFIRmC0w7Cn8LSGbrGcHbRleXQeMsnEM/JHocjtYf5pEWIQ jL8zmEoWkKUM1ElD1URLoEvoEviOoaf4QdRUSH20esOdN1DeicWzX713fBQITw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764929935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7HWJCNsRYYjkKXz7abnpZslUT7Qfh1Z8bwj49Sm+Nus=; b=A46cXi4hl5mpaRaX4SD3xWZbY+uqROXvtWbcTBogtQnBUzIx32+Av5TE1ILKDGvJLZkgD2 sBLP52DuhDkqlZdPjSeIZvrSfsyWfybhmK0N/bQX1rI5qQy5VSq+r6ST9goCqVlAqK8dmx W/8U09g+YR6CRdXYXDQ8Bzu8Y1JtfwmeLl/DnXwOW25BFQiEOGWXxaQeit++o6wf8IxmQO ULbMx4InvHGrHgYpPBe1Q7wYlZ+GpU2AXHelwKgXnkiTdE2CpfRvrdb+qNaSquuWfFPYr7 oo5iUb6HenXyLxOjaHxbcr4ej9TZRSYayhufxnbfw7EHj+4pDWDkOR6MT6TwOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764929935; a=rsa-sha256; cv=none; b=Ya0gTVHKIGoe4jsQfCIVyJH0YGvAfBGUMH4Py+4YQKkkxz2rjwSOAyk2efSjOBzK9SOlYG V/VmbLLc7qTPV6CMMKd9xRpJuYcnlYKYt6f7fKMqAaKckLXhudr8B4w9FMFaV6hs1RUh4u gluTgj8vd6ygS0FbAGwZmwV2n7TOysIYptc1Emf9ci6JA9qxAP4HyoJNBF0qGdodcd8V1k wWEY3GzSImnQEoqVl8IYg4bPnGo72qhiafumhQV6/p5ETVDpQ5KNfiZB7l4hkKAPFSnPqL Vu5fCLHK6w79MYG+/DL2/NnrPi7Ky0ez2eSwp7eoT9/OqtYUTNhZyXO1Jw0iuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dN6mH5J5kz14wW for ; Fri, 05 Dec 2025 10:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35dd2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 10:18:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 234351604252 - main - xhci: Correct name of HCCPARAMS Register List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 234351604252cec485992cb7f5e76aa98c0a4380 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 10:18:55 +0000 Message-Id: <6932b18f.35dd2.7be6b72d@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=234351604252cec485992cb7f5e76aa98c0a4380 commit 234351604252cec485992cb7f5e76aa98c0a4380 Author: Tom Jones AuthorDate: 2025-12-05 10:07:46 +0000 Commit: Tom Jones CommitDate: 2025-12-05 10:17:45 +0000 xhci: Correct name of HCCPARAMS Register On inital import the name of HCCPARAMS1 was misnamed as HCSPARAMS0. HCCPARAMS1 is defined in section 5.3.6 of xHCI Specification 1.2b (April 2023). Reviewed by: adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53895 --- sys/dev/pci/pci.c | 2 +- sys/dev/usb/controller/xhci.c | 6 +++--- sys/dev/usb/controller/xhci_pci.c | 2 +- sys/dev/usb/controller/xhcireg.h | 2 +- usr.sbin/bhyve/pci_xhci.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index cde98cb62cef..ac6c9259b135 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -3764,7 +3764,7 @@ xhci_early_takeover(device_t self) if (res == NULL) return; - cparams = bus_read_4(res, XHCI_HCSPARAMS0); + cparams = bus_read_4(res, XHCI_HCCPARAMS1); eec = -1; diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index 788b2b718062..3dad0985b39d 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -549,7 +549,7 @@ xhci_init(struct xhci_softc *sc, device_t self, uint8_t dma32) return (ENXIO); } - temp = XREAD4(sc, capa, XHCI_HCSPARAMS0); + temp = XREAD4(sc, capa, XHCI_HCCPARAMS1); DPRINTF("HCS0 = 0x%08x\n", temp); @@ -665,7 +665,7 @@ xhci_get_xecp(struct xhci_softc *sc) uint32_t eecp; bool first = true; - hccp1 = XREAD4(sc, capa, XHCI_HCSPARAMS0); + hccp1 = XREAD4(sc, capa, XHCI_HCCPARAMS1); if (XHCI_HCS0_XECP(hccp1) == 0) { device_printf(sc->sc_bus.parent, @@ -3511,7 +3511,7 @@ xhci_roothub_exec(struct usb_device *udev, goto done; } - v = XREAD4(sc, capa, XHCI_HCSPARAMS0); + v = XREAD4(sc, capa, XHCI_HCCPARAMS1); sc->sc_hub_desc.hubd = xhci_hubd; diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index e5424163baa6..d6691b616064 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -524,7 +524,7 @@ xhci_pci_take_controller(device_t self) uint16_t to; uint8_t bios_sem; - cparams = XREAD4(sc, capa, XHCI_HCSPARAMS0); + cparams = XREAD4(sc, capa, XHCI_HCCPARAMS1); eec = -1; diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h index 821897155544..3e3ad278bcba 100644 --- a/sys/dev/usb/controller/xhcireg.h +++ b/sys/dev/usb/controller/xhcireg.h @@ -58,7 +58,7 @@ #define XHCI_HCSPARAMS3 0x0C /* RO structural parameters 3 */ #define XHCI_HCS3_U1_DEL(x) ((x) & 0xFF) #define XHCI_HCS3_U2_DEL(x) (((x) >> 16) & 0xFFFF) -#define XHCI_HCSPARAMS0 0x10 /* RO capability parameters */ +#define XHCI_HCCPARAMS1 0x10 /* RO capability parameters */ #define XHCI_HCS0_AC64(x) ((x) & 0x1) /* 64-bit capable */ #define XHCI_HCS0_BNC(x) (((x) >> 1) & 0x1) /* BW negotiation */ #define XHCI_HCS0_CSZ(x) (((x) >> 2) & 0x1) /* context size */ diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index ff12e40359e2..b3c9f387cca4 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -2354,7 +2354,7 @@ pci_xhci_hostcap_read(struct pci_xhci_softc *sc, uint64_t offset) value = sc->hcsparams3; break; - case XHCI_HCSPARAMS0: /* 0x10 */ + case XHCI_HCCPARAMS1: /* 0x10 */ value = sc->hccparams1; break; From nobody Fri Dec 5 10:25:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dN6wL21fPz6Kn9R for ; Fri, 05 Dec 2025 10:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dN6wK6w9Vz3FDm for ; Fri, 05 Dec 2025 10:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764930354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qvbeoarM37eWAkDoJJxf6cek+Q+5k7bPTESdN2MaUYw=; b=cux4Akk8cni4QpudRVltAwaanPCJACwE7qXeI7lk8SFPRLOTifaxgzI1Ag+Hj/60kr7mqn 5IWH8bFIFA4CBgfjW9EmJW9ma6jQpm15XRWPm4JOpL6mugoG0kWpVca6EfCRU+HfaoKqIQ ps46nCYdm6NaAsYwopsmu4FKQV6lG8HRK2RZaxjkN1wq1ID01K4PLBS26FpW7LIE38rxnq oE9oXIXWsVeLYn6TIsxU7VRJOxJEAbp0l0m/aTa2QkGIj9OblRR3UXgWhxI3Xuckxp7RhC uTqRdsFX4zja/gZ4IBvhZQ6wuWGn1jC/2NE5E7I0Xe3Xz/1kw5oHIrhtmoj7Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764930354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qvbeoarM37eWAkDoJJxf6cek+Q+5k7bPTESdN2MaUYw=; b=MU5gbjYInXVt3zvq2BxGuG1rtBeidDHmp8OMEoWKAdeZ01VZIISiAVE2Mh3zsEyQS5/5z+ JFp15Yp6wIiwJgmE41xohGgevlDqrEbbic7M5eAM7dapwOZcgsErjg9N+JKaxCmiwFmEgl NnOsIj5guhBxRGceuOprqY96M7LMm6jOXrDaXFeqYeqmuqsszitkIRMfQBVOA4VBuhFYw3 pf/Ux9ZWVU5t9bL1W+Yy1RLQres5kgZp3MlXPiIRiolqXFDDzcSUWyU4Y8CbZrWZ0aXm3M gqa21qkQGCbKvV6Ozfr7urG2BzbhhfaSY57iiC/K3RYUJ5UHE2GnSiqXu62vhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764930354; a=rsa-sha256; cv=none; b=CzpRNYziDtFAWWX2FjW8Ml9PWuEQeWqx0rx2ndUilocB/ic/2tbqAKVb/0vS7P5pihvFcy PsiRG/rdT9mNPNFrMG7i7bWp53sFsNRRh2BmVC5zy9Mr/RhR8wiIQCiQF/ufqPX0hz+l1J rT9XWKdOFjD7H4Z8YolY6krvSS5Qa7pmC521C+vVz2R+jJllD4HnEysu7duvFj61Tfr50t GPh6r+bb+VxDC43S3iwMx8eL8pFbwtuIYh/V0Lr6nLpgrueLOUimJW7huiJwxJvlIXs71w Ryjm2FO+a23t2M5EQtoW/uzixklNqASjSg5CW0pz8AH9PaIAJZruIHFAqxbKig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dN6wK6Chqz15gs for ; Fri, 05 Dec 2025 10:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 344e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 10:25:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 836a0d46320c - main - ncurses: readd "bsdpads" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 836a0d46320c18d83029bf138b630b6ce5ebe6ae Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 10:25:53 +0000 Message-Id: <6932b331.344e2.c8c0d70@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=836a0d46320c18d83029bf138b630b6ce5ebe6ae commit 836a0d46320c18d83029bf138b630b6ce5ebe6ae Author: Baptiste Daroussin AuthorDate: 2025-12-05 10:18:48 +0000 Commit: Baptiste Daroussin CommitDate: 2025-12-05 10:24:58 +0000 ncurses: readd "bsdpads" During the import of ncurses 6.5 some bsd specifics configuration where lost and reintroduce quickly after the import, unfortunatly there was a typo in this fix which caused the "bsdpads" to not be enabled in ncurses. Fortunatly only very old programs may be affected by this change, unfortunatly Nethack (in the ports tree is one of them.) PR: 287358 MFC After: 3 days --- lib/ncurses/tinfo/ncurses_cfg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ncurses/tinfo/ncurses_cfg.h b/lib/ncurses/tinfo/ncurses_cfg.h index 33890f300310..e26aa49763f0 100644 --- a/lib/ncurses/tinfo/ncurses_cfg.h +++ b/lib/ncurses/tinfo/ncurses_cfg.h @@ -61,7 +61,7 @@ #define MIXEDCASE_FILENAMES 1 #define STDC_HEADERS 1 #define USE_GETCAP 1 -#define USE_BSD_TPUTS 1 +#define BSD_TPUTS 1 #define HAVE_BSD_CGETENT 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 From nobody Fri Dec 5 13:09:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNBYK6kMkz6Hn7D for ; Fri, 05 Dec 2025 13:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNBYK5mfbz3X3T for ; Fri, 05 Dec 2025 13:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764940181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EXm8PqQXqWVAJoBP6rohVhxrgd2SuOPxpLEXrf8jgw=; b=sJZQwCyUPodotpWQ1L3dRQ9SgQJZiF3/sxTf/sYfhm+vv7O1vz4F01dd42IhhEXOczvDYb TEiM6pKzQDW4wrHBI7JqMP4C/eJTEyITfuPaaM2K10qBFkJsROKS7fNzv6tCedIFA6DoEJ Ihem6PtobfDIhh+aT1/NSZ+vJ2m2G9k1Wppa+i5jZlwPQrGPYXnarlGBy9lKFKO40qnziD OnG3C/am8CCjjRQtImWQ2F9JrWxoDmm0rS9Ocqzn7MXDguKBzHJCsnmQ1o6rfQmnLDdPHM GDAPOdArTdkqsUGToVmCAdX0GN9MjYZ23sDSBUZo35Va4lESrJSUNh8kCgMzKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764940181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EXm8PqQXqWVAJoBP6rohVhxrgd2SuOPxpLEXrf8jgw=; b=VNZPkpioB0LZ9lgoINjFWIpUc5NXo/ETggElCXDpDctfH83BBR4Jp5t+mwRXhx4GBBiHfD +qY61qbLAOMJHtE5hgIL+bQOjg2WG/6XCn/Fzb4KKUVoWxA9bejCc3AmpAFEYVXqgkOYLu a2LkjKmqMjSWu6NBYEh687sGVlBG+cP4zq9oD8XxRZCs1BpTWFkFwlLfPPPwNrPjqZFgZF QKXGbGvZfAhYmg4Ag7hxiV6JaLiKtG4VOO6jPK6gY8bQP+X9jRc16VVqC4/TWkTd4b0V6Z fRFRzo79MjAKHOEGSRDgT8ZDUhfxmtYqPcOEujaLpaop65qD777BzT55dkFfkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764940181; a=rsa-sha256; cv=none; b=NnLNsOLpk91/YLTd1KQsMEXeYAdsXtRryVwMTouOusw3wmyvMxBrRCOtcRoSmsIZ9J7r4T 9WQOVGTWTdkuXjKralYzWK7zoJTjCMba+cjgRmJQszfwDjCQKAHEwmtHaQSzOpE+4qJ1Ct edZA8e/OWvyS+z7RR8fu6vx3gITbc4ZMoINvwkeSJ249AJO6zHdOe64JdxzBSqjcv7/0H8 W0RXXu++mp6cLQ5MUGo/OAL6xmh50HUoZNoojjB1QA+/ly0bq1pu0y+Av4MKtK+6w2gQMM tvBK+LKnw+k4EZGFAvEhZ2RBELa8VENhg5c2CrMNCp+3aH8xojIEGRUIcXBDQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNBYK53Nlz19Hr for ; Fri, 05 Dec 2025 13:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 28083 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 13:09:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f6aa57c86b62 - main - snmp_pf: use the libpfctl wrapper to retrieve astats List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f6aa57c86b6239e1f8c8ff50f28c9d0ed1af2ce3 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 13:09:41 +0000 Message-Id: <6932d995.28083.43c40374@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f6aa57c86b6239e1f8c8ff50f28c9d0ed1af2ce3 commit f6aa57c86b6239e1f8c8ff50f28c9d0ed1af2ce3 Author: Kristof Provost AuthorDate: 2025-12-05 10:23:45 +0000 Commit: Kristof Provost CommitDate: 2025-12-05 12:24:52 +0000 snmp_pf: use the libpfctl wrapper to retrieve astats Extend the test case to verify this works as expected. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/snmp.sh | 6 ++++++ usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 21 ++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/sys/netpfil/pf/snmp.sh b/tests/sys/netpfil/pf/snmp.sh index 37cc4b75cf92..ad80fd457bb1 100644 --- a/tests/sys/netpfil/pf/snmp.sh +++ b/tests/sys/netpfil/pf/snmp.sh @@ -109,6 +109,12 @@ table_body() bsnmpwalk -s public@192.0.2.1 -i pf_tree.def pfTables atf_check -s exit:0 -o match:'pfTablesAddrPrefix.* = 24' \ bsnmpwalk -s public@192.0.2.1 -i pf_tree.def pfTables + + # Give bsnmp time to refresh the table + sleep 6 + # Expect non-zero packet count + atf_check -s exit:0 -o match:'pfTablesAddrPktsInPass.* = [1-9][0-9]*' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def pfTables } table_cleanup() diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index f0f9e0f0e149..91194516614f 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -1356,17 +1356,16 @@ err1: static int pfa_table_addrs(u_int sidx, struct pfr_table *pt) { - struct pfioc_table io; + struct pfr_table tbl = { 0 }; struct pfr_astats *t = NULL; struct pfa_entry *e; - int i, numaddrs = 1; + int i, numaddrs = 1, outnum; if (pt == NULL) return (-1); - memset(&io, 0, sizeof(io)); - strlcpy(io.pfrio_table.pfrt_name, pt->pfrt_name, - sizeof(io.pfrio_table.pfrt_name)); + strlcpy(tbl.pfrt_name, pt->pfrt_name, + sizeof(tbl.pfrt_name)); for (;;) { t = reallocf(t, numaddrs * sizeof(struct pfr_astats)); @@ -1377,22 +1376,18 @@ pfa_table_addrs(u_int sidx, struct pfr_table *pt) goto error; } - memset(t, 0, sizeof(*t)); - io.pfrio_size = numaddrs; - io.pfrio_buffer = t; - io.pfrio_esize = sizeof(struct pfr_astats); - - if (ioctl(pfctl_fd(pfh), DIOCRGETASTATS, &io)) { + outnum = numaddrs; + if (pfctl_get_astats(pfh, &tbl, t, &outnum, 0) != 0) { syslog(LOG_ERR, "pfa_table_addrs(): ioctl() on %s: %s", pt->pfrt_name, strerror(errno)); numaddrs = -1; break; } - if (numaddrs >= io.pfrio_size) + if (numaddrs >= outnum) break; - numaddrs = io.pfrio_size; + numaddrs = outnum; } for (i = 0; i < numaddrs; i++) { From nobody Fri Dec 5 13:10:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNBZq34Njz6HnKl for ; Fri, 05 Dec 2025 13:10: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNBZq16MZz3Y7h for ; Fri, 05 Dec 2025 13:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764940259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tYXvWaOXv/qMWW5L5xGm4O6NOvFqAZjBnGVM8xxJCxQ=; b=Gfv0J7e748sjDmmzirumXrnLPW982vBxVMljeCLC5IK2xEE9C+kuBz493UWxjw44BYA35V SGWaZ7sRU7fKN78d1bcL8ym9YgmJOXRZfP95MMlBk9+rPpCfO8R5aIo/gKuSErk3hRBYQs xjDPFcEqhIxHmv48RsevlM+zW1NmK2D80JxuwY6SsTe1Pm0zkxtJWfWRp5wBtewfTTYajs k0Yx69iL0KA5G8PMwEhw/hI4b8jwHEB/Kdw3yZCWuo+ovlJehwYYj9MfkrC0fKIBrPyZET 8DK/1/7aCuImvrJ9Cju9xEDRnvqKHxFXJqfUTV6YsDLiYebR4PQ/So+uz0k5ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764940259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tYXvWaOXv/qMWW5L5xGm4O6NOvFqAZjBnGVM8xxJCxQ=; b=C7ReZxJKFIy7ePoJj3Z6ojOq+H3uIpHvfdANZh5+yzLAmIgO6MTa2+N8YOvndNzRtm90UK rYq9u9c6X7LpQ+CE4XkI/yoq2F4xn5cGJ2ljwteIsQqyrP9lko/i7aPNUt51pbrltltIpn 5KWk1BsELKIN0odmzFmBlBuguQ9pYuFC4ZYieahULSk62x2UbOFmLMclliuj7Zr/dtIT/O WzNvRdsad79mXbwJNgvNJSyTQcK3X/ccjGW987g5uO4Pxh4cQ/xoMEdiyknIhV4VACU2S4 SOM2f07NQIksDi9yPaKMHfwotifbmPHcjLz+7qf3Cnkp7R0GgBDj4nU285mmGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764940259; a=rsa-sha256; cv=none; b=XWQiS3n761nOgfDzAMZeCCaELyT+FPIul4o06U6UOwxj8MafPqm1IsAdywqG8T4lrTpJhG Xvfd1ShFesR/8vHRXDxXPI8MLQFZw515wOtOP82omaJXvTDAq2f7ucTJ/ZQW3SU6ygWsEV GDJNH6mqPbtq2/2jHM9ZHBP734kMlQ7cE0hBEvn0oMYOHKFLDrw2IDdSUcZ94ww/Lo3YZL KDa8kXk8+jaWXbxDGHW1c5RS8MZfD2nJXHy0y3pf5r2fQNTsIkkoDNMLb20PX5GzdfeSSQ krBMa1vumChyQZ5kKKxdJdePCQBqAPOlWUy9ClxQNz4cTJqPslcUwMxnwUwlUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNBZq0jStz19JC for ; Fri, 05 Dec 2025 13:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 289f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 13:10:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 9155d4b273ff - main - tcp: retire do_newsack - always adhere to RFC6675 SACK List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9155d4b273ffc07e81e2cb0bcedfac570d14a303 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 13:10:59 +0000 Message-Id: <6932d9e3.289f7.62b6656@gitrepo.freebsd.org> The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=9155d4b273ffc07e81e2cb0bcedfac570d14a303 commit 9155d4b273ffc07e81e2cb0bcedfac570d14a303 Author: Richard Scheffenegger AuthorDate: 2025-12-05 11:29:15 +0000 Commit: Richard Scheffenegger CommitDate: 2025-12-05 13:10:37 +0000 tcp: retire do_newsack - always adhere to RFC6675 SACK Depreciation notice for net.inet.tcp.newsack is in 15.0. Remove this tunable for HEAD, streamlining the code slightly. Reviewed by: tuexen, cc, nickbanks_netflix.com, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D54072 --- sys/netinet/tcp_input.c | 11 +++-------- sys/netinet/tcp_sack.c | 41 +---------------------------------------- sys/netinet/tcp_stacks/rack.c | 4 ++-- sys/netinet/tcp_var.h | 2 -- 4 files changed, 6 insertions(+), 52 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 0036a07384ae..c015995ffc7a 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2535,8 +2535,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, } if (th->th_ack == tp->snd_una) { /* Check if this is a duplicate ACK. */ - if ((tp->t_flags & TF_SACK_PERMIT) && - V_tcp_do_newsack) { + if (tp->t_flags & TF_SACK_PERMIT) { /* * If SEG.ACK == SND.UNA, RFC 6675 requires a * duplicate ACK to selectively acknowledge @@ -2613,7 +2612,6 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, goto drop; } else if (tp->t_dupacks == tcprexmtthresh || (tp->t_flags & TF_SACK_PERMIT && - V_tcp_do_newsack && tp->sackhint.sacked_bytes > (tcprexmtthresh - 1) * maxseg)) { enter_recovery: @@ -2780,8 +2778,7 @@ enter_recovery: * from the left side. Such partial ACKs should not be * counted as dupacks here. */ - if (V_tcp_do_newsack && - tcp_is_sack_recovery(tp, &to) && + if (tcp_is_sack_recovery(tp, &to) && (((tp->t_rxtshift == 0) && (sack_changed != SACK_NOCHANGE)) || ((tp->t_rxtshift > 0) && (sack_changed == SACK_NEWLOSS))) && (tp->snd_nxt == tp->snd_max)) { @@ -4120,13 +4117,11 @@ tcp_compute_pipe(struct tcpcb *tp) if (tp->t_fb->tfb_compute_pipe != NULL) { pipe = (*tp->t_fb->tfb_compute_pipe)(tp); - } else if (V_tcp_do_newsack) { + } else { pipe = tp->snd_max - tp->snd_una + tp->sackhint.sack_bytes_rexmit - tp->sackhint.sacked_bytes - tp->sackhint.lost_bytes; - } else { - pipe = tp->snd_nxt - tp->snd_fack + tp->sackhint.sack_bytes_rexmit; } return (imax(pipe, 0)); } diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 13cc7b0de157..f31e88eda41a 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -126,28 +126,6 @@ SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, enable, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_do_sack), 0, "Enable/Disable TCP SACK support"); -VNET_DEFINE(int, tcp_do_newsack) = 1; - -static int -sysctl_net_inet_tcp_sack_revised(SYSCTL_HANDLER_ARGS) -{ - int error; - int new; - - new = V_tcp_do_newsack; - error = sysctl_handle_int(oidp, &new, 0, req); - if (error == 0 && req->newptr) { - V_tcp_do_newsack = new; - gone_in(16, "net.inet.tcp.sack.revised will be deprecated." - " net.inet.tcp.sack.enable will always follow RFC6675 SACK.\n"); - } - return (error); -} - -SYSCTL_PROC(_net_inet_tcp_sack, OID_AUTO, revised, CTLFLAG_VNET | CTLFLAG_RW | CTLTYPE_INT, - &VNET_NAME(tcp_do_newsack), 0, sysctl_net_inet_tcp_sack_revised, "CU", - "Use revised SACK loss recovery per RFC 6675"); - VNET_DEFINE(int, tcp_do_lrd) = 1; SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, lrd, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_do_lrd), 1, @@ -1013,8 +991,7 @@ tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th, u_int *maxsegp) * the trailing packets of a window are lost and no further data * is available for sending. */ - if ((V_tcp_do_newsack) && - SEQ_LT(th->th_ack, tp->snd_recover) && + if (SEQ_LT(th->th_ack, tp->snd_recover) && TAILQ_EMPTY(&tp->snd_holes) && (tp->sackhint.delivered_data > 0)) { /* @@ -1079,22 +1056,6 @@ tcp_sack_output(struct tcpcb *tp, int *sack_bytes_rexmt) } KASSERT(SEQ_LT(hole->start, hole->end), ("%s: SEQ_GEQ(hole.start, hole.end)", __func__)); - if (!(V_tcp_do_newsack)) { - KASSERT(SEQ_LT(hole->start, tp->snd_fack), - ("%s: SEG_GEQ(hole.start, snd.fack)", __func__)); - KASSERT(SEQ_LT(hole->end, tp->snd_fack), - ("%s: SEG_GEQ(hole.end, snd.fack)", __func__)); - KASSERT(SEQ_LT(hole->rxmit, tp->snd_fack), - ("%s: SEQ_GEQ(hole.rxmit, snd.fack)", __func__)); - if (SEQ_GEQ(hole->start, hole->end) || - SEQ_GEQ(hole->start, tp->snd_fack) || - SEQ_GEQ(hole->end, tp->snd_fack) || - SEQ_GEQ(hole->rxmit, tp->snd_fack)) { - log(LOG_CRIT,"tcp: invalid SACK hole (%u-%u,%u) vs fwd ack %u, ignoring.\n", - hole->start, hole->end, hole->rxmit, tp->snd_fack); - return (NULL); - } - } return (hole); } diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 9ed26d5a617b..76bf8f2e3b17 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -5393,7 +5393,7 @@ rack_ack_received(struct tcpcb *tp, struct tcp_rack *rack, uint32_t th_ack, uint log.u_bbr.flex4 = tp->t_ccv.nsegs; log.u_bbr.flex5 = labc_to_use; log.u_bbr.flex6 = prior_cwnd; - log.u_bbr.flex7 = V_tcp_do_newsack; + log.u_bbr.flex7 = 1; /* always doing RFC6675 SACK */ log.u_bbr.flex8 = 1; lgb = tcp_log_event(tp, NULL, NULL, NULL, BBR_LOG_CWND, 0, 0, &log, false, NULL, __func__, __LINE__,&tv); @@ -5508,7 +5508,7 @@ rack_post_recovery(struct tcpcb *tp, uint32_t th_ack) log.u_bbr.flex4 = tp->t_ccv.nsegs; log.u_bbr.flex5 = V_tcp_abc_l_var; log.u_bbr.flex6 = orig_cwnd; - log.u_bbr.flex7 = V_tcp_do_newsack; + log.u_bbr.flex7 = 1; /* always doing RFC6675 SACK */ log.u_bbr.pkts_out = rack->r_ctl.rc_prr_sndcnt; log.u_bbr.flex8 = 2; tcp_log_event(tp, NULL, NULL, NULL, BBR_LOG_CWND, 0, diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index f9297be46af7..7f836f5a1df4 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1308,7 +1308,6 @@ VNET_DECLARE(int, tcp_tolerate_missing_ts); VNET_DECLARE(int, tcp_do_rfc3042); VNET_DECLARE(int, tcp_do_rfc3390); VNET_DECLARE(int, tcp_do_rfc3465); -VNET_DECLARE(int, tcp_do_newsack); VNET_DECLARE(int, tcp_do_sack); VNET_DECLARE(int, tcp_do_tso); VNET_DECLARE(int, tcp_ecn_maxretries); @@ -1359,7 +1358,6 @@ VNET_DECLARE(struct inpcbinfo, tcbinfo); #define V_tcp_do_rfc3042 VNET(tcp_do_rfc3042) #define V_tcp_do_rfc3390 VNET(tcp_do_rfc3390) #define V_tcp_do_rfc3465 VNET(tcp_do_rfc3465) -#define V_tcp_do_newsack VNET(tcp_do_newsack) #define V_tcp_do_sack VNET(tcp_do_sack) #define V_tcp_do_tso VNET(tcp_do_tso) #define V_tcp_ecn_maxretries VNET(tcp_ecn_maxretries) From nobody Fri Dec 5 14:13:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNCzR0qRwz6HtYy for ; Fri, 05 Dec 2025 14:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNCzQ5BYFz3h42 for ; Fri, 05 Dec 2025 14:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764944034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDN0BPq04KpxaWFaIvGYCMM5pB+bEmpgPkb1f768s4k=; b=hs49qHlrGc83P6NBtMkT8pB4D7ik871dF4ExHicq1drn3pdEzq3uwrhBsxDU9SmJa1sbGL gjf3yU2wN8TD5tPUprGFuBp8Mmh7FVxAQMYHhHJt+K4AOCN4aM9jfjcfitZ/uAi9Q7Hp/Q U4OdgV+1Elhks4ttbsx1OV50I7Qdx6yS0lk4YGWa0o522P7r6Lb3BXYklJQoUr7PBnshQi mSoF9SeXE8wPx/MqQg7Akzfdhb/b5HnAPjO6ivPO7IFzo6/l1KRPNv0457tj6YdHLGPt1T F9Lo8SsVBgIVTm6A7su1eFB/epOw6wQj///Trtzfe1fTUQf04beyFJw0H5S4/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764944034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDN0BPq04KpxaWFaIvGYCMM5pB+bEmpgPkb1f768s4k=; b=sBxRBc23ftfxaHeUqWuvu2c9ZobsAI/JHdPv5jvEVjaI35oJnd+0gUfLKisN2NVFi2wuSE T0W6YMJ07/89gkEi9HMXKtwGzzSvPvobme9wDUZAqHZUc2ee/cmAHnZQ9Wkf2dkmoDWGcx kipB1g5bnbExCRd1TSYAvBPOQ4vjVPGeR63Vq8o+OARkT8zzeYOTGbzuO6uxPqryEZkswn euCNyqdGzlhqkR/+XOYWMEiE8dHSTtDknqu0Qy4jVZn7wjeG1UlpAs1hISeVFpEiMfzx5g EzthazRBo/NSFy5f3XFA/Mso99SwCvqtvsguMK1p6YHdxONFamx0LDuV/BXHYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764944034; a=rsa-sha256; cv=none; b=NRcryGro1U0KKegEpDlqeE/WzGg1hT06NiSKC+YcXfG0WPLtBjr/fNBXF2KJiwUg6TdGFt hEKDQodOko7JeCW/kHJ7hQemTc0aiqnJoxzVm0KB01otXFECNZ3UztPbBq3R2ihUWlJ32z wiJdoBbagL9GueDQZHT04xvaGUs40ZCsUs7sYEvbyA4BD8tHdtKHEPqOh0feoW1kgIIy9h TX8qTaqkX1X7S+K4i4p2DAf5SCG5xZeFwMh5qntCsq49PNzhTC9H82Ld19M/vWVkt7rr4y FLpn2IykVDs4iBK6GrflLp+RMd4sIcdGOEaKYXRvtW6SLWEJSuhCIpX5irJO7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNCzQ4hbkz1CFy for ; Fri, 05 Dec 2025 14:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d8b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 14:13:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Siva Mahadevan From: Robert Clausecker Subject: git: 27ff0bbcfd27 - main - libc/limits_test: add no-op testcase to satisfy kyua List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27ff0bbcfd27df588d3f486cb21180a26031b889 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 14:13:54 +0000 Message-Id: <6932e8a2.2d8b4.6f0b56d3@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=27ff0bbcfd27df588d3f486cb21180a26031b889 commit 27ff0bbcfd27df588d3f486cb21180a26031b889 Author: Siva Mahadevan AuthorDate: 2025-10-23 13:17:25 +0000 Commit: Robert Clausecker CommitDate: 2025-12-05 14:12:46 +0000 libc/limits_test: add no-op testcase to satisfy kyua This test suite is purely tested with compile-time assertions, so it needs a dummy runtime test to ensure that kyua reports the file as passing. Pull Request: https://github.com/freebsd/freebsd-src/pull/1915 Sponsored by: The FreeBSD Foundation Reviewed by: fuz Approved by: markj (mentor) MFC after: 1 month Signed-off-by: Siva Mahadevan --- lib/libc/tests/gen/limits_test.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libc/tests/gen/limits_test.c b/lib/libc/tests/gen/limits_test.c index b4e8bf3178f1..7324ef74319e 100644 --- a/lib/libc/tests/gen/limits_test.c +++ b/lib/libc/tests/gen/limits_test.c @@ -93,9 +93,12 @@ CHECK_UTYPE(uintptr_t, UINTPTR); CHECK_UTYPE(size_t, SIZE); /* dummy */ +ATF_TC_WITHOUT_HEAD(dummy); +ATF_TC_BODY(dummy, tc) {} + ATF_TP_ADD_TCS(tp) { - (void)tp; + ATF_TP_ADD_TC(tp, dummy); return (atf_no_error()); } From nobody Fri Dec 5 14:28:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNDJ65kPcz6HvS5 for ; Fri, 05 Dec 2025 14:28:22 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 4dNDJ62q2Yz3jvk for ; Fri, 05 Dec 2025 14:28:17 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-47790b080e4so13911375e9.3 for ; Fri, 05 Dec 2025 06:28:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764944896; x=1765549696; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wiPf7V5O6JjUtsmkh0TbtpMi1DnPGiy2i9fS6HauyR0=; b=vNiw2443Bn+6Tl3sGMS+dovCstzq3Gxmx7T700YSaWxglS3ecYmxm7wqPpc5yUzw4h 10bRjcD0DCIgsFTC0y5kIvzY3wkyMA/PqSj3m/YhuPzN5bskQCIrlkoo9jnypyPtkK4t s00vLDXPJiOcH39tiK2/6dEXXhKIkiwQOoHSSq6nApDKLaAiTN3+V8zoZQk+lBDt35Yv OSOyCoCNXWWIH1Muj345cr21MsBvaC8Ir0Fs2SVSiwZfKEfvUrSBGNV4VQJ9VOGGvzev h5eCDzDP4y3pbugdk3/iG3Eb+9h1CmBVQgKjH6c4WwkESjBQs5WW8zo5BBZx/SEwYaza sCpw== X-Forwarded-Encrypted: i=1; AJvYcCWPzwrar7qiNcofj2JbgEo37exEC1GCQQBb4f46bm/vq0a3e99rpPhJwaJTGyG5+26fR3nxDTa8Nn711Lh1il0vDJ4zNw==@freebsd.org X-Gm-Message-State: AOJu0Yzh4jC9Fn+zwhhx8hBrkCdmILaioOgnWhJh+zTX785tyCTtEGna J8ZJA0mE5CbWu9HrPIuy5YuPRfjrl3U5rPQWXpFAq9v0LQZs5ZZ5yySc245tqFNH7JfSQrKmTnY G984x X-Gm-Gg: ASbGnctqlusp1r4gH+ODDMwJ2hyAbP467tZFr96iMBwK+h97TfVop7aF5fl+zrhFAaF bADdrbzgcMpsD1fdLBO7PiVxEYS4JOH+FTgOipxItT5S0/q36GKgGWtqyYRKf4hmsHC2pk9BJyV B31tyXat2vTRfJiPlQi9kTLIRpVhv8qK6e3ocXFangxaTAvCYBBDHnVH1nyFD3Do94eOu56KAQ3 0o1nBD/TeIzU7iKQtoxmp5Wi/mfHF2SK98R3kVvIhFOcV60qrOIbNNjrgKwhgXLwndNVfhAgW9X AWXT58Sj5Os1JpV6D/WioY0Bgqwt0SSPiylAdNe0ppj9iNHCUaqr3OtJON5SpNEi6gIML3MjorS VCt0jCDDSi/v15NJHNaUZDPF11dQBt8vtfG9WUZCWsnYTutj7MOR/WZElM8v2RasNgG1pAcD0u6 0sbCxcUzKwrbk0XFk0S65rrs8CXS3mnguZil6LujTRkdQxLg93qe1j X-Google-Smtp-Source: AGHT+IH0UbocoKC5XcHPlv7y4eotP0NFMz+jIUGtDuBnbxHBs/3HgvZeZq0g+E9DFuKnwQPT2ML7Lg== X-Received: by 2002:a05:600c:450a:b0:477:b0b8:4dd0 with SMTP id 5b1f17b1804b1-4792af1b10fmr99328785e9.17.1764944895559; Fri, 05 Dec 2025 06:28:15 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42f7d353c9esm8655216f8f.40.2025.12.05.06.28.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Dec 2025 06:28:15 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.200.81.1.6\)) Subject: Re: git: 27ff0bbcfd27 - main - libc/limits_test: add no-op testcase to satisfy kyua From: Jessica Clarke In-Reply-To: <6932e8a2.2d8b4.6f0b56d3@gitrepo.freebsd.org> Date: Fri, 5 Dec 2025 14:28:04 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Siva Mahadevan Content-Transfer-Encoding: quoted-printable Message-Id: <1F88B5B5-D18A-4CF4-90A3-138EC7AB13A4@freebsd.org> References: <6932e8a2.2d8b4.6f0b56d3@gitrepo.freebsd.org> To: Robert Clausecker X-Mailer: Apple Mail (2.3864.200.81.1.6) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dNDJ62q2Yz3jvk On 5 Dec 2025, at 14:13, Robert Clausecker wrote: >=20 > The branch main has been updated by fuz: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D27ff0bbcfd27df588d3f486cb21180a2= 6031b889 >=20 > commit 27ff0bbcfd27df588d3f486cb21180a26031b889 > Author: Siva Mahadevan > AuthorDate: 2025-10-23 13:17:25 +0000 > Commit: Robert Clausecker > CommitDate: 2025-12-05 14:12:46 +0000 >=20 > libc/limits_test: add no-op testcase to satisfy kyua >=20 > This test suite is purely tested with compile-time assertions, so > it needs a dummy runtime test to ensure that kyua reports the > file as passing. Why are we building and installing tests that do nothing at run time? Why are these not just compile-time assertions that fail the build, like we=E2=80=99ve got in the form of test-includes to verify headers = include their dependencies? Jessica From nobody Fri Dec 5 14:58:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNDyh59d9z6Hxhj for ; Fri, 05 Dec 2025 14:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNDyh4Zq1z3rDT for ; Fri, 05 Dec 2025 14:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764946700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyTgzptbRAcQ9E3+MyQ1pijBQIw6k+wNdctSNgRmknA=; b=q9He914921UKQcML8W+WHTbXnWrHtNRtGf447SPP2RQGtD+8zXaWwHQcw2EUOp/z7Ths0X 3M3/9dyCUaLhX6vgtjxyuOXpG3pYOvd3Xmk8jfPWPOxFsRh5+lCI+0lR19LpElYUQfjVjy 0TSW0UJ67qP6Vw5cGUyCtqtbO6vIrAu+sg/la089d/dyicMdGliBYYRJY1oMinm9JkF/im pKBfUIJlYgfv2C981E/md8UxEp/y2nb5tnsxacoDSuD1ODTIj+Lh3gQv+Xdj66QFkaZKQK /UI5ThS70KSFbnqcrd9o4iGzYj2bwRdmW0hbBbaNm30AFwpjkDmXkB8bOgBsrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764946700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyTgzptbRAcQ9E3+MyQ1pijBQIw6k+wNdctSNgRmknA=; b=dTyKIByLD9td9A+zGrQXtRB0zc2i8w0UheBvDPISUsPGLpd0aYTrSt1m6iSoK+4C4o0FYp jGCEx2E1+xPB7GcQMyfdLoITjiVtdyFCmcyftHSyvYy8vUHlr86MZeTuk6lzhfOCfsvckH HgHDpJyoCwYFSLpLiOPQAYP86eTObtpnN/GzF1jer8GZdwUKWJ7dhXmBR2L3+UPfT59Os2 D7WF5c0O1Q9674BuxgeZocooU1v20o1qO7XSWrdE83Ymllhfaui9d0dszduTaxlCXVcGLv uifIUPPzHa07Hzo3ytosgUhIwmt//XpEgv4A+7Asn/rASDyocqJmKJFPkCIH5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764946700; a=rsa-sha256; cv=none; b=EU2GpeHpcVa/Kg4kxYfG7ZRRuYmGev4KjMVNLVhhcAr81ktlmCSlATvzxCnJPovzfRpFBo Bp7E1R5/3JZ80BM05vqOGaZ/eJr7YgHkhfnH9JuUah7e3CGrVU8V30W3+MzbS2SisfJshs F8YZk8AI7Iq+RRlEeoXRYk6bh9cj+68oiGFv/jtbpt3d7vnwABtmi6f+FyBn5aS848lHKj 5jKE0A2zQaBfQqc/byM2lCnUJSv6mJOzfcP4HakYp+R9YNwxSIUZVGZxwzZ4m6TI3MKZEN wleE3Zu/rXwabfe47FFRidSf5TA30ffAsMZpvb9N8p8Y67wNVbK3jVMOzCXoSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNDyh3tPzz6b for ; Fri, 05 Dec 2025 14:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a51 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 14:58:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4c2295c15860 - main - bus: Return 0 if reading an ivar fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c2295c15860e70c8bd3f05f9229d2fc40dfd50d Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 14:58:20 +0000 Message-Id: <6932f30c.32a51.5317e0b2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4c2295c15860e70c8bd3f05f9229d2fc40dfd50d commit 4c2295c15860e70c8bd3f05f9229d2fc40dfd50d Author: Dag-Erling Smørgrav AuthorDate: 2025-12-05 14:57:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-05 14:57:37 +0000 bus: Return 0 if reading an ivar fails In the non-INVARIANTS case, return 0 rather than stack garbage if reading an ivar fails (in the INVARIANTS case, we still panic). MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D54078 --- sys/sys/bus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index e0c6c590ce8d..86afc53da562 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -933,7 +933,7 @@ DECLARE_MODULE(_name##_##busname, _name##_##busname##_mod, \ static __inline type \ varp ## _get_ ## var(device_t dev) \ { \ - uintptr_t v; \ + uintptr_t v = 0; \ int e __diagused; \ e = BUS_READ_IVAR(device_get_parent(dev), dev, \ ivarp ## _IVAR_ ## ivar, &v); \ From nobody Fri Dec 5 14:58:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNDyj5jbVz6HxHs for ; Fri, 05 Dec 2025 14:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNDyj4Zzkz3r1b for ; Fri, 05 Dec 2025 14:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764946701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=heT/8npxI0XJ053zfGht8h5kdep7DA/SMJNWVi+P4sY=; b=UGmnOaT/RSJowtcUEslsmlbQyJ1fJk/umW9NZWNQx7+bZUtLU1vZcgZPqdY4DqSU131taK z9ZazVcmUhcFcck9IL7vcYsb3oGETNS4lTxNoMKhrcuKt4XvvN1651uAXmb5TbXdxH1N5K SebLlC6tmMuCGdFyIe2tFLYlD+QZjM7qDAPPErXYN11OyhrDqQ9ZhU6i1hJUmKt16Qq3Tv StZcp3OUYjmYModSQUXyWg3ziLLmlbVgEdCMn++WQ8fWqbjhsL9CAw21DjNIKeABWgEIFi rWBNFGVVOonRdKKDxgtTJWFjVVx8eTCrU7DjM4sYAM9WmYl4bcGTLCf5Y7VtDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764946701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=heT/8npxI0XJ053zfGht8h5kdep7DA/SMJNWVi+P4sY=; b=omd3tnWfIqzK4Kr1evuF55RHNdYA+OM+odXm//locAVGL8GRTqCKqNVBnmnG2FMJH9TJ1j awjyxxIZAjW8LT19tq1+gkhRm8pquqyM6E/FMiCZzTiVVSB24kjLYHdnDMnivBlKz/IvlD re/b2x5P8JXm0NCdGauMwA3c42Wh4TpcwFUHnVL+mUmOF3UKKAwxFiTteOAg4JdhFQWaOl mgjKVGFp7viO1HWYVnE6IE3CHNcmOGSDwyhAUXw/DFVVBoHKF+ZUP2X4IcuJQf+Kv6FSxz dftqdbjMYdbX02hPvJG7uxDQLRYpKNDP+MbWOl4QkfeRwYi7BGakjRHha/0K7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764946701; a=rsa-sha256; cv=none; b=tMG14cF4AjhZa9FUUY75etXwGac92TebfKalsPZbbxSGohcDCXVucxjTSpD7pVhOLA+auK C5XQ+KXxR7EvreBifPKM2QQn1jLx5iCFQvPhVb6JAU5/GYuODcHrlHDiVI7jryS7Cskx/W WDIvkEQDEqbDqoL5jBFFSC0OZprlvp2PDbNJn5StGEzu5seEZBB/46J/qN8Rc8ApnvGoo2 5HCS2C2I7TcyzgzOmoiDGdQ6YUOBr4Io0Nm8O649boHDUa9lKFcBVpW60j4n8nrHyQYf76 GiqLqu1t9/eEsMYMIhp6C4nRkraldEcKkJR381oU8agxR75Dr4PJR6IfgM8L4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNDyj48RyzNq for ; Fri, 05 Dec 2025 14:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3243e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 14:58:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 69e041521a80 - main - fsync: Open files in non-blocking mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69e041521a80a0b8950f6ec25269a9c3949d6590 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 14:58:21 +0000 Message-Id: <6932f30d.3243e.5e729b6b@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=69e041521a80a0b8950f6ec25269a9c3949d6590 commit 69e041521a80a0b8950f6ec25269a9c3949d6590 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-05 14:57:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-05 14:57:44 +0000 fsync: Open files in non-blocking mode This avoids blocking forever when invoked on a fifo. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54084 --- usr.bin/fsync/fsync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c index 9968bc8614a5..f3dbeed3cb77 100644 --- a/usr.bin/fsync/fsync.c +++ b/usr.bin/fsync/fsync.c @@ -49,7 +49,7 @@ main(int argc, char *argv[]) rval = EX_OK; for (i = 1; i < argc; ++i) { - if ((fd = open(argv[i], O_RDONLY)) == -1) { + if ((fd = open(argv[i], O_RDONLY | O_NONBLOCK)) == -1) { warn("open %s", argv[i]); if (rval == EX_OK) rval = EX_NOINPUT; From nobody Fri Dec 5 16:37:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNH9c6zS7z6J5p9 for ; Fri, 05 Dec 2025 16:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNH9c64nNz3By1 for ; Fri, 05 Dec 2025 16:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764952676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q7BzMgeL8QVj1pQaJgQN4ogxSX4GM/NOKUEJpN1Fz0Q=; b=f93TvzxucU2wmrHcqFiUzo3zeonr/4kHmGqfzfrclqDnasSVfUDMAtxDyGOOla+SZKAOAx iUhaLg3JKxvUe0UkCPDCx+jIEjFIQGPgOI5WM33hSK2faDs/1qOHVsacz7f8Z8Sf3AZHZw oRk/Ko5gMUpawRPrU0V+maggpQcKMxKH8/oFxpmzZvj9taaCMUK9UCK9sE7gRVtpQARgDA xSS1ul0fn5v65ruJMAzpHbmE4MPWvNROwBfOkMLarZr3xcdH1xZMP98uexIu6GIhZsl/Q5 cFoRCRSMMV6IZLIBPYvsXpoKWtK0UFw+L1ABTDVA8X0oB1/wX4sfgKdElgz44w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764952676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q7BzMgeL8QVj1pQaJgQN4ogxSX4GM/NOKUEJpN1Fz0Q=; b=InnKVffTnx5zx+FIiWx/ipPcQ8nHIqGaNkBrNVHNDp2laap/G6qY6DLnTJpu//v97gWcQX tu1aQuOoqNFvE18wKeMaatD7zE23UnIxMeWatm4uhlBQPXOolk6MdYtpW33QCdemZEI5KA bR9ddlOlRoN1ii955J63dm4RZLzzPrsQb8yl0ApPky1qDFbx+leUUqwBd67+Y6lK8KOZag 5P0H2kliC52he8OxHFgnwWCjJFqQ5Sm440XAg3zSkCsyV+kq1Ysibs7nKNgBQxDeN2Daeo yEvo6SqyWPtJRkWg4W12Wadlm3deM1tvsjfSOJb6G8/m/ArjKiZY3VNt1NdyAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764952676; a=rsa-sha256; cv=none; b=v9J4Q3KXF3+qoAMrWGuAld0p4daLwmUS/UiTtyQc6viMSuX9XJa4H7EN3+gGPVoLEoy7EX 7jWeYB/o11xJlfLAGUXyByjCD6MSKYaPEDfMhyHSQozBSU3bMcahjXUJc+nqfLdC12CP8x CGCCYgNxTSGmn4WcluFhwLsh+f5kSbJKATNtrHLlUfcIHft9zqug7xc+Ae5bR/bPIaHvzQ MrFVTKk/D7ekAkgwwlLGL/dHMyMWx7ev49UysxUDENE/p7YmPh4P5/em+NF4BeNZ3daRMK BwFwuEw2nN0cosrUFKWpi9Hp13drWmlwequTDALguodYb077AL8XPLOEZ59Q5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNH9c5P9Fz396 for ; Fri, 05 Dec 2025 16:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 16:37:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 59062fd0b2f1 - main - netinet6: use IF_ADDR_LOCK instead of IF_AFDATA_LOCK List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59062fd0b2f1a159a94f97cd05a76f66eb40837c Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 16:37:56 +0000 Message-Id: <69330a64.3b0c2.29fd282@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=59062fd0b2f1a159a94f97cd05a76f66eb40837c commit 59062fd0b2f1a159a94f97cd05a76f66eb40837c Author: Gleb Smirnoff AuthorDate: 2025-12-05 16:29:00 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-05 16:29:00 +0000 netinet6: use IF_ADDR_LOCK instead of IF_AFDATA_LOCK It is not clear what exactly this function is locking against. Seems like just use some generic interface lock. The IF_AFDATA_LOCK goes away soon together with if_afdata[], so put at least something in its place. --- sys/netinet6/scope6.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index 08702a2e81ab..a683ebdec956 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -137,6 +137,10 @@ scope6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) } } +/* + * XXXGL: The use of IF_ADDR_WLOCK (previously it was IF_AFDATA_LOCK) in this + * function is quite strange. + */ static int scope6_set(struct ifnet *ifp, struct scope6_id *idlist) { @@ -144,11 +148,11 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) int error = 0; struct scope6_id *sid = NULL; - IF_AFDATA_WLOCK(ifp); + IF_ADDR_WLOCK(ifp); sid = SID(ifp); if (!sid) { /* paranoid? */ - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); return (EINVAL); } @@ -171,7 +175,7 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) */ if (i == IPV6_ADDR_SCOPE_INTFACELOCAL && idlist->s6id_list[i] != ifp->if_index) { - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); return (EINVAL); } @@ -187,7 +191,7 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) * consistency for safety in later use. */ NET_EPOCH_EXIT(et); - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); return (EINVAL); } NET_EPOCH_EXIT(et); @@ -201,7 +205,7 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) sid->s6id_list[i] = idlist->s6id_list[i]; } } - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); return (error); } From nobody Fri Dec 5 16:37:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNH9f1srrz6J5Sk for ; Fri, 05 Dec 2025 16:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNH9d6nNLz3C1R for ; Fri, 05 Dec 2025 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764952678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQ2xdM5FCA2ZWnx04xqTFN9wGquKqXKPeK1j3lv3x3Y=; b=C7qb0y7FyXNgi1dCaYQjXHROX17BBG1yNp8tNssCh5Ek/6gbwTK4FpT6n5/oPaawIDwX+W HUH/pY+QPV33yLQQ6ZlcbiyWrklOrKZVy66kxs0P4RZzhXAPlRYeJ/0HRnFv8QuYuvSHfb GYZ6fixq5mu8grqHMUxwnOu6eoI3W22ajHuieMSjdN6ndLnmL0Mbatv6J4DFGb01z5Ggu4 1DyzuP1GxNOFiM5PG4LjddibJlYN2ZN0k4/qeOBTdda5+A2mhye7XlJxluhn7Dp0+eTOJK LmLZvufrpoMt1Op54+sueng4m91Qz4jTf/1oGW9aR1DmkBKPm24UYukBOKapEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764952678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQ2xdM5FCA2ZWnx04xqTFN9wGquKqXKPeK1j3lv3x3Y=; b=oeNOb1vvOYYgEwGSPsnKzsUZj/zR4Sc77x3URVIpSW/XeuQdevMzKlXGNXnH4Yw/lqWDvX ZUkSjedPKCs+WvtFs3CfzIGW2DZPSTTso+tFm2lWml5p4UhzzL/+DG/N+gSeS5hgTXL445 /r3vQy7Y6c2Dw6szaMjBIe6WTPxQaqkWLcZ821EQrszBwnDqJidDalAdGUTj1S1KYnZ8/B InjByMlL02NiJNdLJQl7ghcDU0GPIF67Ih+v5v5cvV/LksoHbwD1QnyJGKW4EAPnebio/q QCwD1aXLJE+1QpBMVqj9/GPSWMzyb0+OzC0XyX6ptbMxs0YQzOpUthOg0x/1dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764952678; a=rsa-sha256; cv=none; b=E7hgaaMoVXYURW8HvMo2MFY2hYwcawQyeve7yHHa9ektPl2YIV1fSl4g19n9R8AtQWJYc/ ZA00YAk/7umWP+hiTXn+Ny2MgFYbTcQU+6LpYQnfGr3Au6jzbddppz3T2Y/yv6rscmWYkf zpIZtbODATAM4PRPxb2l8CUj/etPp88ghCuX7qIntWBOmBw2fWiaZcdpco1TZ9oZhJeNRP k4DyzxQWcM03RzJF4L4xP88h4geL6CbgI4kzqOe//pg0pp9fHrPE0KpolQ1RlTwAJELgtu tm18M+q+/1g0/KgpTcSWG3Jd7k4OfZ0t0rO5yuvKrIfLAnLaBj3FhMATw/zisQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNH9d5dDPz314 for ; Fri, 05 Dec 2025 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b8b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 16:37:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8291ea8761c2 - main - netinet6: use IF_ADDR_LOCK instead of IF_AFDATA_LOCK in defrtr_ipv6_only_ifp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8291ea8761c2d686d43f14c08ec0e644673b28f3 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 16:37:57 +0000 Message-Id: <69330a65.3b8b0.13348106@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8291ea8761c2d686d43f14c08ec0e644673b28f3 commit 8291ea8761c2d686d43f14c08ec0e644673b28f3 Author: Gleb Smirnoff AuthorDate: 2025-12-05 16:29:00 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-05 16:29:00 +0000 netinet6: use IF_ADDR_LOCK instead of IF_AFDATA_LOCK in defrtr_ipv6_only_ifp It is not clear what exactly this function is locking against. Seems like just use some generic interface lock. The IF_AFDATA_LOCK goes away soon together with if_afdata[], so put at least something in its place. Note that this code is dead anyway (#ifdef EXPERIMENTAL). --- sys/netinet6/nd6_rtr.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 224cd7e56b4d..7bbba30a3a21 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -253,6 +253,9 @@ nd6_rs_input(struct mbuf *m, int off, int icmp6len) * interface to see whether they are all advertising the "S" * (IPv6-Only) flag. If they do set, otherwise unset, the * interface flag we later use to filter on. + * + * XXXGL: The use of IF_ADDR_WLOCK (previously it was IF_AFDATA_LOCK) in this + * function is quite strange. */ static void defrtr_ipv6_only_ifp(struct ifnet *ifp) @@ -276,9 +279,9 @@ defrtr_ipv6_only_ifp(struct ifnet *ifp) ipv6_only = false; ND6_RUNLOCK(); - IF_AFDATA_WLOCK(ifp); + IF_ADDR_WLOCK(ifp); ipv6_only_old = ND_IFINFO(ifp)->flags & ND6_IFF_IPV6_ONLY; - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); /* If nothing changed, we have an early exit. */ if (ipv6_only == ipv6_only_old) @@ -312,12 +315,12 @@ defrtr_ipv6_only_ifp(struct ifnet *ifp) } #endif - IF_AFDATA_WLOCK(ifp); + IF_ADDR_WLOCK(ifp); if (ipv6_only) ND_IFINFO(ifp)->flags |= ND6_IFF_IPV6_ONLY; else ND_IFINFO(ifp)->flags &= ~ND6_IFF_IPV6_ONLY; - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); #ifdef notyet /* Send notification of flag change. */ @@ -328,9 +331,9 @@ static void defrtr_ipv6_only_ipf_down(struct ifnet *ifp) { - IF_AFDATA_WLOCK(ifp); + IF_ADDR_WLOCK(ifp); ND_IFINFO(ifp)->flags &= ~ND6_IFF_IPV6_ONLY; - IF_AFDATA_WUNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); } #endif /* EXPERIMENTAL */ From nobody Fri Dec 5 17:30:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNJLn613Cz6J9mG for ; Fri, 05 Dec 2025 17:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNJLn4100z3KfP for ; Fri, 05 Dec 2025 17:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764955857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4IBKFZNmGlj7LGUx5JTl9/rRNb9H6Hl07N/m/KhFL0=; b=xR+zwwagclN3g68oSJ+rTAzuibSSv/qJbmJyrbxPK4lbiU2/M3gDoI7UweGWV5Xx7iTabn 8/LAGoPa9Tuv8LHCbleF2ylVy6vSEGKuaKNLI8Yf4+6t8lGuztuWGP5Eq5FzoXmOaGN+Et CSDsxNL77at1KJawHAvqw8VFirqQ6wMvCrfUvFBCAMlj+rJ5hDxMMCwqaHD0Mo29GLViQ3 0weJsIfHDZFPNwMMUmDrqnK5FHC5HCNTYe8ar5Z2xSKROY2bxazdlIcF/9bSocGHnTwq5W eH6GOBm08kjRoslojNwCieohuSRZVDAhPn2XYmH3uvLfJaT1uAlZ/vkUbz68iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764955857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4IBKFZNmGlj7LGUx5JTl9/rRNb9H6Hl07N/m/KhFL0=; b=N0AQYOg5JXXV+Z7yAJyMPrxv0DzWpGTSQ2KeHUQGKKHl+AQDGR1qrlyyoTrhYJ5OuDBVfA JUmCDGXSB5EpkWIeoscK+K96hexWcdbtOZaf2KqBYd1aHP4d/1dmZ7rwus7299q6FU6Grg +IScPQA+CVN2rpJcGxkMNCfol95b+OlOjGss5YBpQWVwGUr8hVQhqUOjMkE+NGW+l0YKA0 HQ8NcDk4krDloA8zeTQqWZ2Qi3esPC46o41XhIUhjLmPbPwmeZrp6q7LUscGTbcH2rn8ps AZvsXhOudhc6N70OfmLp5c+kh0j3j2+HbILEsifVuYoGnn7HR3KQGD7Jy81GiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764955857; a=rsa-sha256; cv=none; b=ZanEfTLBRt+SEVHVpz72++rmH/Alph3KexXM4p69M41j7TIFYhgkab64ZYApv79HNbtb3R yADGCxl0j4Xbf2KcAg2lca+6cA0tcUY5icbtPjRn7izt0PNHPM+6AYoybMJlKflDNly3ZD jOxhll8F7riiMEYABusjdg9UhChzxunTRwm9zs/K12Uwj9IyhYBuDk8nFH8jK6TtFhqIFY QEvVUte/DfrquttpjTo2ch7y8IQdRdaXi5PmMVk1spkZT1nv/tHL4o2HyDKm0tDPO8AXRP ZoN+Bv6hX6EFLO6K8IBPu4T0xiye0KNMs2K9NHhWZ5f49EIIJKPYSr1/ZJiGdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNJLn3ZMKz4YW for ; Fri, 05 Dec 2025 17:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9b96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 17:30:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Oskar Holmlund Subject: git: 9c5b56aa03cc - main - sys/dts/arm/ufs.dts: fix compile error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c5b56aa03cc761b94d4f9986076fd72aad38f57 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 17:30:57 +0000 Message-Id: <693316d1.9b96.497b170@gitrepo.freebsd.org> The branch main has been updated by oh: URL: https://cgit.FreeBSD.org/src/commit/?id=9c5b56aa03cc761b94d4f9986076fd72aad38f57 commit 9c5b56aa03cc761b94d4f9986076fd72aad38f57 Author: Oskar Holmlund AuthorDate: 2025-12-05 17:27:57 +0000 Commit: Oskar Holmlund CommitDate: 2025-12-05 17:27:57 +0000 sys/dts/arm/ufs.dts: fix compile error Fix compile error due to the include file am33xx.dtsi has been moved. The Linux device-tree archive has split the general directory (ARM/ARM64...) into vendor specific subdirectories since Linux 6.5. Reviewed by: kp Approved by: manu (mentor) Differential revision: https://reviews.freebsd.org/D53894 --- sys/dts/arm/ufw.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dts/arm/ufw.dts b/sys/dts/arm/ufw.dts index 9e6a75ec12fb..8c1fa1e20302 100644 --- a/sys/dts/arm/ufw.dts +++ b/sys/dts/arm/ufw.dts @@ -27,7 +27,7 @@ /dts-v1/; -#include "am33xx.dtsi" +#include "ti/omap/am33xx.dtsi" / { model = "AM335x uFW"; From nobody Fri Dec 5 17:37:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNJVP6h1Zz6JB60 for ; Fri, 05 Dec 2025 17:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNJVP5m8Cz3LnQ for ; Fri, 05 Dec 2025 17:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764956253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oYS+eBX0nLBMNLovj9jS8RLECHHQ10KhULPXoLWFGKw=; b=PC4mJC85eoeiIyYP7ertbxRDE+vwLi8xQ4tXaEWU6HFbuMccxWGZ9WnQsGeRkjkZxT2gmm Adys9iNB/xlr3hRTOH/x6oin3HEVAXF9Lj8wzFtlnYm5KK7xMCpH+j8gUGAQFdoPIjqKBx BmXebchtP2HhjMjqNnzgwXw7idvMBKdPxchjxXhjD4iHBWgrUp3CtGyVaA9kz7A6TAvPmv QscPrIIj1aoC7RKMIDmHAzBIqOsxXeVnZET86o8k19CcGKsTcJ84wdwE49sjyWKXSTMyR5 m0gn8AaeK9uRQxyyWCTBEts5aVd7Lj88sOfEAonrsO/Azzjo/C/7lzTICV6bdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764956253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oYS+eBX0nLBMNLovj9jS8RLECHHQ10KhULPXoLWFGKw=; b=gOPx07LjZR/yWveIqjGaYG0iiekajE9lXA+7ouijFv06IDxp6CXRHBvn09TzOHO79qlb5D xBaPd8cOo5Di2nQ3NYRqaRWsdN0sSbEL6HTmp0aLXZ3s4vOnc+W6ubbclJCayn71eCKW/S 6ixUgq5G8RQlNhbt8yJUbYpv76EvccksCVBYi/pitD6RQTn8iSFZMgqpzdQnB1Txxg8JdF nciZbBOZoXYPQCeodzL4/AMkBEZ4LqHDjcurPymDXEB++KWIWkWfCzmnIR/hgF9ikqoiDS 6qMHXARyxTOXq8CmqrzwDd2x/r+VEjCm/gUtQ7jzbprLj2L04rLm2j/KfyYQwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764956253; a=rsa-sha256; cv=none; b=WG0MQgBjuXICLSymEZoWwDpwIf8/Ft3meCLfI8ZUGmpJh1BaYLY4aQKN6P06geHW1Qmm0A xz+0Kejcn2Lc0Vq7+l3RR9vZO9qGo2QDfzeT2KeHrKVv9wXWE0LoufJJwzULJ0rsIkXufd CX+RmlcnG/ztgc7U8w//CzrUVsToTdK7B+iLu07ygT2p7Gx4MK4ZUTGQGVhOGkonXL83IS 9H9RktnRHe6+0wyRZ4ajcwR1FvrFXeHhyTY9y4z9XUH8auZyhGnPYuhYUiMzlIMtYroY4J qYCkoK6cgdB52b9d8uZBSBBdlatRtjYEQLzjGPROAAUW1GhtPVrPN2yduxdIBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNJVP5Jxmz4Wr for ; Fri, 05 Dec 2025 17:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9b9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 17:37:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 5c7176bba30a - main - certctl.8: Prefer the new TRUSTDESTDIR variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c7176bba30ab3b250177cba3923bdc84b68a7c7 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 17:37:33 +0000 Message-Id: <6933185d.9b9b.6d09dc2@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=5c7176bba30ab3b250177cba3923bdc84b68a7c7 commit 5c7176bba30ab3b250177cba3923bdc84b68a7c7 Author: Jose Luis Duran AuthorDate: 2025-12-05 17:36:49 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-05 17:36:49 +0000 certctl.8: Prefer the new TRUSTDESTDIR variable With the reimplementation in C of certctl, the environment variable previously known as CERTDESTDIR was renamed to TRUSTDESTDIR for consistency. Although the previous variable is still valid, prefer the new one, as it is described in the manual page, while the old one is not. Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54044 --- usr.sbin/certctl/certctl.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8 index e58da8e7ff84..2d38ce020c04 100644 --- a/usr.sbin/certctl/certctl.8 +++ b/usr.sbin/certctl/certctl.8 @@ -24,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 9, 2025 +.Dd December 3, 2025 .Dt CERTCTL 8 .Os .Sh NAME @@ -106,7 +106,7 @@ in and all untrusted certificates in .Ev UNTRUSTPATH . A copy of each trusted certificate is placed in -.Ev CERTDESTDIR +.Ev TRUSTDESTDIR and each untrusted certificate in .Ev UNTRUSTDESTDIR . In addition, a bundle containing the trusted certificates is placed in From nobody Fri Dec 5 18:33:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNKlL1nqzz6JGMd for ; Fri, 05 Dec 2025 18:33: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNKlL134Hz3VTw for ; Fri, 05 Dec 2025 18:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764959630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NuS9RNWNYSz/ExHxyoTchQivw5FXbBDYYEoYgYQyMoU=; b=kAxO0HSJHgSdowWBchILlzgsA3/xtCpXvOjIv6TPrhZGqftThLSCFrOwQ0F7GUYQVzj+Rz cE8IBaYjPlsRVD6nDl0AKeFtL34Mx27sU3vqXatkvq2XWVFwyo5hL+D2xQH0QY9ePqcibC 6klWpDRwEjgJqJxjruM3Jxxm1esfq3jL9RnkB7+zMzl43DwNFzbmic+aW0Oo4x38onW6Aw CGVAYoRAlUYnfAEehAcj38UO/e1jIAM1BbWEpTtZbPf861nQWb17AhwiYJCFql0U+XnsSn TRmQeyN9WMNM5vphbmd/ARN+Mi76MubCgmmgEryLt9EPuXpptaTGIJEf1lV+8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764959630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NuS9RNWNYSz/ExHxyoTchQivw5FXbBDYYEoYgYQyMoU=; b=uF9nc0b5aHsRBDQCV/Pc8snwK+dcSf7+c6nE223kUTDB3Blvcn+FGJkS4HMXc0hW12Ws15 6KMvtTlX7qdPSAc/SGmnP424qsxi6wxR5QbP/B4NjsKz/4H2cnZi+rUD74A6rZ+JIyclWB /CXjHmrI3ru5qma2kbxRAMKIweUXiyK+65hs4yQ2qepCIqElCRqjFsylJPKxv076O6UdAM dQP6Uf5wAx9iAju37nTQGCegcCicorC4F5zqACXImxNYjSMPjArEyhA5NH7ow/9LweHlHe xhcecaGebo4na59ficGXR0t5PeMd8zoq+RNMGqAlY/eqMTmZG7cJ1cHl8UpfAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764959630; a=rsa-sha256; cv=none; b=fIzyzRNpxl32zfvHMQ3okqoYHAMoq+JeJ9AOrtYBbjY0Y6mmQv3DWdisZhyJNCZEky/mdr MSuFkkybj4Z4o3jAnkFhAD0GtxSszop6p7sAj9UY7PzrsJVtnwttPwaLgBW1DruaTIJRkc 0y+JUE4x6NHe89Dgny8HmG3LksC280omRKcvsf2XM4J3lexw1OYpwn4xUim9U7rrnQtH5r jqCmQb+3KQzPjeN7mVq2W2w3h4/q18YJQZRA84JH5SWsRP/4iijhJF/O8pV6wLEU8rF4FL Z5MjZlAJ6TxANUi6ZBaRELccnGk0M2dWT+03JJYTOUHTPJn+1Y7PDaesmeWDKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNKlL0dz7z693 for ; Fri, 05 Dec 2025 18:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f864 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 18:33:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Oskar Holmlund Subject: git: 8f0b21089483 - main - Update path for TI Am335x device trees List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f0b21089483b2caa99e41211ef55a59e67a709e Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 18:33:45 +0000 Message-Id: <69332589.f864.673c66b2@gitrepo.freebsd.org> The branch main has been updated by oh: URL: https://cgit.FreeBSD.org/src/commit/?id=8f0b21089483b2caa99e41211ef55a59e67a709e commit 8f0b21089483b2caa99e41211ef55a59e67a709e Author: Oskar Holmlund AuthorDate: 2025-12-05 18:32:50 +0000 Commit: Oskar Holmlund CommitDate: 2025-12-05 18:32:50 +0000 Update path for TI Am335x device trees Since Linux DTS has been starting to using vendor subdirs we need to update this aswell. Approved by: manu (mentor) Differential revision: https://reviews.freebsd.org/D53890 --- sys/modules/dtb/am335x/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/modules/dtb/am335x/Makefile b/sys/modules/dtb/am335x/Makefile index 9c8f007cf4e2..e065ed26df29 100644 --- a/sys/modules/dtb/am335x/Makefile +++ b/sys/modules/dtb/am335x/Makefile @@ -1,12 +1,12 @@ # All the dts files for am335x systems we support. DTS= \ - am335x-bone.dts \ - am335x-boneblack.dts \ - am335x-boneblack-wireless.dts \ - am335x-bonegreen.dts \ - am335x-bonegreen-wireless.dts \ - am335x-boneblue.dts \ - am335x-pocketbeagle.dts \ + ti/omap/am335x-bone.dts \ + ti/omap/am335x-boneblack.dts \ + ti/omap/am335x-boneblack-wireless.dts \ + ti/omap/am335x-bonegreen.dts \ + ti/omap/am335x-bonegreen-wireless.dts \ + ti/omap/am335x-boneblue.dts \ + ti/omap/am335x-pocketbeagle.dts \ ufw.dts .include From nobody Fri Dec 5 19:30:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNM0m0D5Jz6JLNx for ; Fri, 05 Dec 2025 19:30: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNM0l45bpz3ddR for ; Fri, 05 Dec 2025 19:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764963031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsvLn4v/RYc2HnB/h4QTiTo/CC/Td0qCtTa7Roawf1I=; b=peQslVwXSsLyL8nH0SkNU2ttMFcLyTJ0s8KfSRtgl9Mec47iyANdtkhgWMRtU3i9WWBUld SzkujR4CzU4A1h18EB8EBu9/WNVq8DD/DwSMKIHvjZMSUfWp4aa5SxKO6hKjmYF5cFuQSb 6te3vd9MB7i+PB2OigXGkiXUNTCd2f6DqogRtdW4+l64W+yppwbwvxipyhh5geV18ip8Js 4X5ez9NzVEI2hQexL5fgWMNFaXvARy1togSurFinLmqRKfaS97Yk1lkJ4MvUpVv9dUW/bf Z9sRtnMNpRyv2Gnid8+zIGmOln6ZmP0mH5sM5Kwfs32OfV45hkxXV6Br+ZteRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764963031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsvLn4v/RYc2HnB/h4QTiTo/CC/Td0qCtTa7Roawf1I=; b=aeShjVvMu5i8QfH2a8tSkfiaE//tk/kbEh/1KLeP7oyAgtw1HdTMkYCgb4KFUBW4kvLEMK 10DcT8Qf5p63c82UgLi3VNg45vpm9fJ/DxSC6tOzIbIguVvI/Nf4LeM1hUod4re97m/sRP SHeLzo+RGb7QK0J+sfsXK/QbjWqdKFfd5ga2+75mpiwwTRyDihS5aKwqVvD0cXEPe6xOEP P+gFxl2jlel8nqi+7ouYm5it0Vq24EYr5n6F4Qk2oLBGfSMLY9nf3Ye98OI1OweesuxsUo Up3USYAD62WElVJyQmwiNpWwZCb5lN7BpPkJr3rfIRTmEj5tF85Z/QZjHdNH3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764963031; a=rsa-sha256; cv=none; b=sgAKxkj0m1G5VWoiEEPZslgqeRNnFyyaCHMRGojj3ODdblC5/nOkuq7/jw/DORVuYXcGS9 NYjxwmKVrkgg0qRHR0EdEiBhnPLDC6p6kz4xiBqL1RoG7aT9izuAS24vuI6fSXcu6+h1AW CSolFFJ89VYcktMFeNrpHXnvI0YqCM1NzGC49liaCFaYwosdwO58kF39Jjm46h+PhNTSM4 mblPyQoVxuOeyyPtV2qO09GqBB+3Vj4cCBmcbIWJsqMMEhrnncA1V+752V7ypIS7bHLi8g wubLwuoUTEkeOuvEvorQ+8Jgbvba3wN6XvyDlbp9hl6ro1OZKOMvwDXE6qfSOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNM0l37YVz7Kf for ; Fri, 05 Dec 2025 19:30:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 19:30:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: bc14dcd113ae - main - tests/if_bridge: mark several tests as requring vlan(4) or gif(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc14dcd113ae49b778b14d7bc446d57e96f40365 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 19:30:31 +0000 Message-Id: <693332d7.26e9b.516b6229@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=bc14dcd113ae49b778b14d7bc446d57e96f40365 commit bc14dcd113ae49b778b14d7bc446d57e96f40365 Author: Gleb Smirnoff AuthorDate: 2025-12-05 19:29:43 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-05 19:29:43 +0000 tests/if_bridge: mark several tests as requring vlan(4) or gif(4) This makes them "skip" instead of "fail" if the module is not present. --- tests/sys/net/if_bridge_test.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh index b3405fd978c8..4b9293514176 100755 --- a/tests/sys/net/if_bridge_test.sh +++ b/tests/sys/net/if_bridge_test.sh @@ -145,6 +145,7 @@ stp_vlan_body() { vnet_init vnet_init_bridge + _vnet_check_req vlan epair_one=$(vnet_mkepair) epair_two=$(vnet_mkepair) @@ -538,6 +539,7 @@ gif_body() { vnet_init vnet_init_bridge + _vnet_check_req gif epair=$(vnet_mkepair) @@ -642,6 +644,7 @@ mtu_body() { vnet_init vnet_init_bridge + _vnet_check_req gif epair=$(vnet_mkepair) gif=$(ifconfig gif create) @@ -704,6 +707,7 @@ vlan_body() { vnet_init vnet_init_bridge + _vnet_check_req vlan vid=1 @@ -880,6 +884,7 @@ member_ifaddrs_vlan_body() { vnet_init vnet_init_bridge + _vnet_check_req vlan epone=$(vnet_mkepair) eptwo=$(vnet_mkepair) @@ -1008,6 +1013,7 @@ vlan_pvid_tagged_body() { vnet_init vnet_init_bridge + _vnet_check_req vlan epone=$(vnet_mkepair) eptwo=$(vnet_mkepair) @@ -1052,6 +1058,7 @@ vlan_pvid_1q_body() { vnet_init vnet_init_bridge + _vnet_check_req vlan epone=$(vnet_mkepair) eptwo=$(vnet_mkepair) @@ -1099,6 +1106,7 @@ vlan_filtering_body() { vnet_init vnet_init_bridge + _vnet_check_req vlan epone=$(vnet_mkepair) eptwo=$(vnet_mkepair) @@ -1229,6 +1237,7 @@ vlan_svi_body() { vnet_init vnet_init_bridge + _vnet_check_req vlan epone=$(vnet_mkepair) @@ -1270,6 +1279,7 @@ vlan_qinq_body() { vnet_init vnet_init_bridge + _vnet_check_req vlan epone=$(vnet_mkepair) eptwo=$(vnet_mkepair) @@ -1335,6 +1345,7 @@ bridge_svi_in_bridge_body() { vnet_init vnet_init_bridge + _vnet_check_req vlan bridge=$(vnet_mkbridge) atf_check -s exit:0 ifconfig ${bridge}.1 create From nobody Fri Dec 5 20:12:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNMx55Kxbz6JdmN for ; Fri, 05 Dec 2025 20:12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNMx543L8z3kBt for ; Fri, 05 Dec 2025 20:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764965545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cmqhDF5PGoTGGDOdICti5PlMPnAVfGTFgjbMGpbXVs0=; b=yhggvHsr9uVVz/EAF+i4ahbG/GS305kksOO6Lx4FEqojonrfG5mImZzQvrHMg4fqCVh08d IwT0z2EAJdoYTRJDo2DhZHOxdB3U1ENk3qW+z0MboHR6XOSIcQf9kYrm5rSHg6dgYSOd+K Brt/jSHVh2wZhfIOk67aDWfkTvJ5h3Jp9/ygRyfbT/k6ds/CnRmJL7f1NOcCvgCTw/Oek7 Q5z8hH/c+UHLHmkd1vWpSzjtxnghUjHt6ne/ZUILqY1fO0IScG+aVEbQ0IhfdTOcVKnSgh nx+KAEK8oggY6ayXCsAJvJwSdiaAwRTVGchO33EXL7GaFHuS5v51mIuUR6D8bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764965545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cmqhDF5PGoTGGDOdICti5PlMPnAVfGTFgjbMGpbXVs0=; b=mQgyQPfI9AvHD7Go1ntczoRzmQxgu6/Cmn1NmKgck/lE4Ip1D8GBAE23LCgt3XZOZdQH4n 7oArdj6d+80TkPbvlqpQfArRbppyhjDeZ0jhmoQclCHS7RyvE7yCe6th/iVbXHEmeoVD8t 9J+Bwzn37SBTmHXbvWUDqk9Okw30NDZ50on7NsrWAo61bGs56JZFcVOoREcaLh6xfUxj/3 WM+w3sjd0Uv1o5wykyscb3azAYR6L+XPlwAweohB7BGwZERcIha6rwRAO5Ub5Ph5FXUl9W 6+e8M6kLVZ2pa5dZgXlIUGvy4YWzA+J5bvpd61uTUdM3cjatV0Ex6bqOTYJxXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764965545; a=rsa-sha256; cv=none; b=iOeCQbWnFN5YALv1oBtOV3Wypr2YiO2ORYG3wiZ4e/g0tIdeLGb6UZ+HG2aoJaC2I5dXoJ fCp3FLXZmdagzEUd9VaCskI+zFcU+E0iYp9k3SGr4hQeFQQVG6kmhfzjE5InJ4OGsHIK1Y t2KMQHfBI29G2b+1k5RCqqFe5gNm1Y9iWdmbnRTTArfysVhPXA0ZJGl1ja3NiqT5r6ZO+j ATIbTYhWb9N+tgm+EgcgQQ2SVRBjlcn3XCulp1zVWSWJJ+1Vu1G2oWA3NDsbDdie5yAY3H sz11gDNJXC4iK3UINBASs+ByegvoPH5bSClbpT13t+gwUPylYqyFsv5ZwXJPnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNMx53N1kz8Yh for ; Fri, 05 Dec 2025 20:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2b8a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 20:12:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron From: Ed Maste Subject: git: 112a6912e1c9 - main - linuxkpi: Add dummy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 112a6912e1c99439a7e2a75f3961e18f3b800c6e Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 20:12:25 +0000 Message-Id: <69333ca9.2b8a0.449f0a0b@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=112a6912e1c99439a7e2a75f3961e18f3b800c6e commit 112a6912e1c99439a7e2a75f3961e18f3b800c6e Author: Jean-Sébastien Pédron AuthorDate: 2025-05-26 18:10:51 +0000 Commit: Ed Maste CommitDate: 2025-12-05 20:12:01 +0000 linuxkpi: Add dummy There are no consumers right now except the upcoming . This is meant to reproduce the same includes as Linux, in case consumers of implicitly rely on namespace pollution. Reviewed by: bz, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50851 --- sys/compat/linuxkpi/dummy/include/linux/percpu-defs.h | 0 sys/compat/linuxkpi/dummy/include/linux/percpu.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/sys/compat/linuxkpi/dummy/include/linux/percpu-defs.h b/sys/compat/linuxkpi/dummy/include/linux/percpu-defs.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/linux/percpu.h b/sys/compat/linuxkpi/dummy/include/linux/percpu.h new file mode 100644 index 000000000000..e69de29bb2d1 From nobody Fri Dec 5 22:07:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNQTK6kygz6Jp99 for ; Fri, 05 Dec 2025 22:07: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNQTK5ZJBz46Bs for ; Fri, 05 Dec 2025 22:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764972421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAAIKJEo3WZe7EHJsDZKWh2O4R+KTTjYyiqat4kkySc=; b=jl++WYROmuWj5LwpUM0NZ1BfPUWilmZb43PeCvL4cy7dck+QdUpVZkC9wZ1xIPO47Ux1df Wn7CnuXUCTIgjDvB7XZ6Cl6/JcHCUT2zbIIatfSMlx7kSSc/PTo9xzlycAWNJkZKBxqOFF vtnJnhT44h/GWrqa+rOCblgilGVYG6N8kI4Sei6v2pIbVUCoxjBS34F9z1IKqoELa95GEx cGxmWT0qWPXs4Nh69uA4oauRA9bKKD1vk/uPSCsHHbenYSntItOJttfzLp+RfZ8Yl3h2Sm 0aBfCHEuqEm1IYWtdc6msvPQi/ztYs6vom0sxpjYbSc09RAmYiBa7d2P6G/y5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764972421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAAIKJEo3WZe7EHJsDZKWh2O4R+KTTjYyiqat4kkySc=; b=geXW1URXCct35t7nvy5bcMeqIIXCV9REQ3YijP3wrh1AbNOxaRO/XzHggWdtEROX5SyyAB M26EAjLCFKZZaPEyC8EWrl3Hw5gGLFLG6fZbhS9eI1/Q/o5I2hw/STOrk1d1Xw8nFuufzz YfgzJ3Z6MBJohDWt6rd7FIYfjfQcvpE7MFC4ZvEsba6OMjwGBtL/tCTkadIaJ3KJ6ccUZ4 m9BwPQjBuKP+owzAdxee74FI+xqct3duhdVsz0ZrrpZS10DQEcuDuhWrxSbKZNgF4gF7LX pj8PtiFOI8VemQKpnvGRmgwisMPTiV7apegDKAoprHJyhRI5Y0RkRpyoIFrGRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764972421; a=rsa-sha256; cv=none; b=xfyTEZsaPQlzfFc5Ge3z7OXbvHhwuY85q3a0sxorbkPcC4aZfk0mYMsXKO/cZH1U7ahgCx mxjyGH+AlzlT4rlBlktbVrhnUFFQAGR5qKN4sGesmU5sftOSXcTSaTqvmOb0x5vS3fEJD+ 7bgYc4uh5AEMr5IHkDymFcr98qim+bkhdMW7bJISKuaHDr4JyAbPLI2PI/Fn+n4FhlEv8E 2rzHdGnTkGq0ByDkugzl/rv71RCqbE0ivhyrTkOHX9zKeccOmIPOCDvSsdxNS1/zawAn5o IUB9AL0ERc9Wcgjl+WhclIccBvWqRmMuRlZnh0+2s4ZTAX8B5MiLD09z7sg9Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNQTK488tzCR9 for ; Fri, 05 Dec 2025 22:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 348f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 22:07:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: c6212b7da110 - main - ice(4): Add support for 40G maximal PMD speed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6212b7da110d82b1d0086ec525deb216993021e Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 22:07:01 +0000 Message-Id: <69335785.348f8.60c84bc6@gitrepo.freebsd.org> The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=c6212b7da110d82b1d0086ec525deb216993021e commit c6212b7da110d82b1d0086ec525deb216993021e Author: Krzysztof Galazka AuthorDate: 2025-12-05 22:02:45 +0000 Commit: Krzysztof Galazka CommitDate: 2025-12-05 22:02:51 +0000 ice(4): Add support for 40G maximal PMD speed E823 backplane devices may support 40G as maximal PMD speed. Extend port topology reading logic to handle this case. While at that fix indentation according to FreeBSD style(9). Signed-off-by: Krzysztof Galazka Tested by: gowtham.kumar.ks_intel.com Approved by: kbowling (mentor), erj (mentor) Sponsored by: Intel Corporation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53587 --- sys/dev/ice/ice_adminq_cmd.h | 1 + sys/dev/ice/ice_lib.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index 6225abc0f38b..b2dde986dd23 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -2131,6 +2131,7 @@ struct ice_aqc_get_port_options_elem { #define ICE_AQC_PORT_OPT_MAX_LANE_50G 6 #define ICE_AQC_PORT_OPT_MAX_LANE_100G 7 #define ICE_AQC_PORT_OPT_MAX_LANE_200G 8 +#define ICE_AQC_PORT_OPT_MAX_LANE_40G 9 u8 global_scid[2]; u8 phy_scid[2]; u8 pf2port_cid[2]; diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index 8b6349f686eb..393726eb1f59 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -11344,10 +11344,10 @@ ice_get_port_topology(struct ice_hw *hw, u8 lport, return err; if (cage_type == 0x11 || /* SFP */ - cage_type == 0x12) { /* SFP28 */ + cage_type == 0x12) { /* SFP28 */ port_topology->serdes_lane_count = 1; } else if (cage_type == 0x13 || /* QSFP */ - cage_type == 0x14) { /* QSFP28 */ + cage_type == 0x14) { /* QSFP28 */ u8 max_speed = 0; err = ice_get_maxspeed(hw, port_topology->primary_serdes_lane, @@ -11362,7 +11362,8 @@ ice_get_port_topology(struct ice_hw *hw, u8 lport, if (max_speed == ICE_AQC_PORT_OPT_MAX_LANE_100G) port_topology->serdes_lane_count = 4; - else if (max_speed == ICE_AQC_PORT_OPT_MAX_LANE_50G) + else if (max_speed == ICE_AQC_PORT_OPT_MAX_LANE_50G || + max_speed == ICE_AQC_PORT_OPT_MAX_LANE_40G) port_topology->serdes_lane_count = 2; else port_topology->serdes_lane_count = 1; From nobody Fri Dec 5 23:18:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNS3d5bCKz6JfZZ for ; Fri, 05 Dec 2025 23:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNS3d2rJ4z4HpQ for ; Fri, 05 Dec 2025 23:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764976701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E197d8TzeUZAfsi9gcuUcVLLhfMLV3ojNqmnfkXryiY=; b=uCv98e/Tiw60jwpxPhrKYGQ7zSz7kJZsRRjUN/KGZHCu1nqqBGFE8W+vbYB1WE/Ha7qRnQ Qoow9GzscK9nHzd6q2eLe49Txi1KdOu6uhuoaI/OO+IFDALB1Cp6J+p6xO6UNh+FxoyhjP NHSL6RQW1b0FUZIARfGqxz3/9Tuo4G76KHxvbq0NePjrmYPl7DeHCsJNwq9bKCgscI8Vp2 kLPoumJ3ocE+svR8/3nm80Ca4YVyumjAGMaRNXBElip2vMcEWm57uSGmUKCqGUZzeIeWTC mp5NYnM0tD0G3kGs7br0P+CKWMVZq5KZ8TfqcLaNJYVBXKyehFM4dDIr2IZetA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764976701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E197d8TzeUZAfsi9gcuUcVLLhfMLV3ojNqmnfkXryiY=; b=LeHOMm+Z+ckb+lD72O2RVwwL310Pc9QvNwmS+PwwljcZcKdxzuRvFL2sPUU45HLuHBFdDq aFdHptswbEUDHN2vUimZOFYjGALSe+SOrfnWWklDpdctnZPhkVtrgtULAr3rKExX+mvf5M TGTvvU8PLdnof1/+P2pAU+MvxuX2JJrCqKoC6EncvIH+fb8FC9iD6wqLUA1ye0FehvNgDs +R6CEQ494N9Nh540lUMddmUj2FENmw0dyDjqoL75AkahmMCNHkh2+/SaVG9gPTaDSOCVJQ n6f6q3yV9SbaM03vSoXXcwSr/rGaI5LPrx5xYJ+Nde5SZJEEYCUp9YacmI34bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764976701; a=rsa-sha256; cv=none; b=ldeFDwDWeLTSJFR8bbbv6AxokLPPj2Aie8JqQC1rqpYjA1OsJszW7uyu0YtlmDzQpk28/Q Cyznn+uZXjYJWRpBp05SDRFykgtQjT3EJ1rO3+NJH9oECEonKl9r75vyUA5FSe6Me5eeHf +v24kzjcKxp7LVo3IUe1H8oePRkMyOhsr8Rr69YMam2goGgI01xzC9FE1/+QTh0YF4rsw7 g0fSmeBc6OgCjFbLsD+yCnkbaBtvegnKsqbQUUxKBbEhz2/9YOOf3qflTZlqyTLK+reFaY WceXVpaNw/WQZCCBYQNnf2p02OqWuX0rU2NT+skDyNFVx6nJcwntiIKutaH3Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNS3d1ZvkzVcX for ; Fri, 05 Dec 2025 23:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cf21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 23:18:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f5b812331db5 - main - nvme: Improve error message for invalid format value List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5b812331db52783292e89192a04195031132c23 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 23:18:21 +0000 Message-Id: <6933683d.3cf21.3a4aef29@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f5b812331db52783292e89192a04195031132c23 commit f5b812331db52783292e89192a04195031132c23 Author: Warner Losh AuthorDate: 2025-12-05 23:17:40 +0000 Commit: Warner Losh CommitDate: 2025-12-05 23:18:12 +0000 nvme: Improve error message for invalid format value Improve the wording of the invalid namespace value. Reword the comment and move a line of code to the block it logically belongs to. No functional changes intended. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D51393 --- sys/dev/nvme/nvme_ns.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 4ebcc03c4f04..b6611161a2b4 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -563,16 +563,14 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO); } - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); - /* - * Note: format is a 0-based value, so > is appropriate here, - * not >=. + * Check the validity of the format specified. Note: format is a 0-based + * value, so > is appropriate here, not >=. */ + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); if (flbas_fmt > ns->data.nlbaf) { - nvme_printf(ctrlr, - "lba format %d exceeds number supported (%d)\n", - flbas_fmt, ns->data.nlbaf + 1); + nvme_printf(ctrlr, "nsid %d lba format %d invalid (> %d)\n", + id, flbas_fmt, ns->data.nlbaf + 1); return (ENXIO); } From nobody Fri Dec 5 23:18:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNS3f3RxFz6JfXX for ; Fri, 05 Dec 2025 23:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNS3f1zJ9z4HpR for ; Fri, 05 Dec 2025 23:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764976702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kACfRtu/Hf3k8jms677SeYEAw0A2iT19QXhpv788FH8=; b=VzrRoFDtBViI8BOzFuQ8u0JaVj1F7FKrh1/JBExaRjexFJJ+H44KSbUV/WcAaTnxrC3PU2 zjR1JfIH9DRMxd70Ccw/wmg2kt5gD7FIiCag0z9lez7R8eWk81t380i2Q7hVVOwXsuT2Dx V7raqCIqHwFkEj8QOFnJ7CTDZATnRKztFJxiGi7mudbc6yS7TKFsqqR3P/ASUWbe4+ZAdN KE/GKpBOc1zotYQmKmFK+bEbpSo1mEwqhRAxtlyJyn87oIZPoZf6eCyVHXsHugCS4G3XGQ f12laEv7CXFbN2PuA7isSpkIYnMRCCCWPatKrrp2p48No3L8NN/uaPrH5RdMHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764976702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kACfRtu/Hf3k8jms677SeYEAw0A2iT19QXhpv788FH8=; b=N4qvLdRwXJsdIBD6UJYH8OZ4qpV8FoFTHpe/8PisPdi8VwLUNnJVw5DsSWrCKxxc4nLsGU qJlsvTHJSSIoJulbSYJkQ+9/T47pv4qQdw1dXM9H9YPKvs1LAv7d+LTFh4nNsvQ14b7Keu aWCmxyKkkob4qp04yPZvROi7JP4E6nAfqfZJlUcqTU9B1HGZktzk0KplshODKzjSXt6dTB bGkbY6WAPjVU3D3Aq16pc9/0oUqGx4gXEMSoUmSUDL92Z5d3NivewSoPz8YgqJf8YZpl6t 6otuYH+QeDjzI+hyLpjYRfR0JFvEYWdV29dhVp6I/jX3yAZ8GPJQ+Zhgk4Wl+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764976702; a=rsa-sha256; cv=none; b=kbwByzkSPLqJtwhCPtXi+13pETSlHAlcRWp/RqQmvEKIRgwL+bKxTtau4FVh/z3z9aLz0U 9IbaVmhWsecaYNcoEvqfGXFQR245Nmfw5HnqPAlZj9Xuy3KLQJJxlZURPmtb7WOnNmvSU4 TFc8U6EdzQF4K8al9TH4bCysx0WD2aKbrFwU+MMu8fbMj3S3ScsRzkuzYbbit+CofT1kz2 pVrIgXPpFsgs2hi/48KvRiFIBuW0XWeYyZHXhf97zc3TLpwcgXEGYerETTgzegEovRBXU8 R6dphlTuolVyzybn9C4cEkWL22dIDtnRN/KW5T29mH5NadxgdJ+0tDp01PrlaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNS3f1QjXzWBP for ; Fri, 05 Dec 2025 23:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cd05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 23:18:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 10efa7c30209 - main - nvme: Rename NVME_NS_ADDED to NVME_NS_ALIVE and _CHANGED to _DELTA List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10efa7c3020909391255819bb38bd87478aa2b19 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 23:18:22 +0000 Message-Id: <6933683e.3cd05.e056c49@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=10efa7c3020909391255819bb38bd87478aa2b19 commit 10efa7c3020909391255819bb38bd87478aa2b19 Author: Warner Losh AuthorDate: 2025-12-05 23:17:53 +0000 Commit: Warner Losh CommitDate: 2025-12-05 23:18:12 +0000 nvme: Rename NVME_NS_ADDED to NVME_NS_ALIVE and _CHANGED to _DELTA NVME_NS_ADDED will conflict with a later change, so change it here. Likewise NVME_NS_CHANGED. Sponsored by: Netflix --- sys/dev/nvd/nvd.c | 2 +- sys/dev/nvme/nvme.h | 4 ++-- sys/dev/nvme/nvme_ctrlr.c | 4 ++-- sys/dev/nvme/nvme_ns.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c index 4737b2b03ae9..9250fb54c234 100644 --- a/sys/dev/nvd/nvd.c +++ b/sys/dev/nvd/nvd.c @@ -541,7 +541,7 @@ nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr_arg) struct nvd_disk *ndisk; struct nvd_controller *ctrlr = ctrlr_arg; - if ((ns->flags & NVME_NS_CHANGED) == 0) + if ((ns->flags & NVME_NS_DELTA) == 0) return (nvd_new_disk(ns, ctrlr_arg)); mtx_lock(&nvd_lock); diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index b09fa44b0329..cceff065fb2a 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1927,8 +1927,8 @@ typedef void (*nvme_cons_fail_fn_t)(void *); enum nvme_namespace_flags { NVME_NS_DEALLOCATE_SUPPORTED = 0x01, NVME_NS_FLUSH_SUPPORTED = 0x02, - NVME_NS_ADDED = 0x04, - NVME_NS_CHANGED = 0x08, + NVME_NS_ALIVE = 0x04, + NVME_NS_DELTA = 0x08, NVME_NS_GONE = 0x10, }; diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 55b6d6b745cf..3d8b26d2004c 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1230,10 +1230,10 @@ nvme_ctrlr_aer_task(void *arg, int pending) break; ns = &ctrlr->ns[id - 1]; - ns->flags |= NVME_NS_CHANGED; + ns->flags |= NVME_NS_DELTA; nvme_ns_construct(ns, id, ctrlr); nvme_notify_ns(ctrlr, id); - ns->flags &= ~NVME_NS_CHANGED; + ns->flags &= ~NVME_NS_DELTA; } } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index b6611161a2b4..52d7e998198b 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -560,7 +560,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, */ if (ns->data.nsze == 0) { ns->flags |= NVME_NS_GONE; - return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO); + return ((ns->flags & NVME_NS_ALIVE) ? 0 : ENXIO); } /* @@ -623,7 +623,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d", device_get_nameunit(ctrlr->dev), ns->id); ns->cdev->si_flags |= SI_UNMAPPED; - ns->flags |= NVME_NS_ADDED; + ns->flags |= NVME_NS_ALIVE; return (0); } From nobody Fri Dec 5 23:58:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNSxx0z79z6JjBn for ; Fri, 05 Dec 2025 23:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNSxw63Mwz4MSb for ; Fri, 05 Dec 2025 23:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764979108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T412IYQhA74/OI83eb9ZIk9T1jL83vcH+/OPo4vdEVA=; b=jthO1Gco0D8WrR6lZ+eeCnmq3avRALHr13gjmJtzgzJDN8Gd8kq6HGwko9tYrbDFYuN1Hi 11YOdq/rtFV7GRewpb4N11vqPh51Gp43owYzPpdPmmy2m8Nz73t/PTyPGXtzvFooOBN7l9 g4iBH4tK2Cx+gWFHq6roQtui4nQg1u0GoKBvV7qebCVNXmcIrpCtv1oUJQhfVq2tKIXAJM EqkObWuUBQU4cOE5HoNF9J9HkImIomczVDiQZ7tRNsvjmND+tOKVwfo47h+6TLm7e8n1OB mvZ58IuXSfVA0f5Y9TdBQx8GX7eqZwNWwou0X8WM5FtTsUSu5cxkUfMjlEg8EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764979108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T412IYQhA74/OI83eb9ZIk9T1jL83vcH+/OPo4vdEVA=; b=k7UDpRzbUbhbXeTLg6k+aPsJ+CycmpKK0juoGFSgCJZhB60K6U23A9VqwfCuxexlyzr6Ir nd/pAvLf3qOq07UT7X+cURxdspAAW4KtuzQmyhWDQMxSRI0QpDH7S4vcorxEwJ/mc/Rv1N paYDWrvjuiNyWltzrU64CFpWBijCYMt5Fl8gPwLhYtS+Q7yfFegc8d6rVqyWIiK60lDyil sJHl0Q492ekdf+DIpWMpfbJS9UEogaRWOO82jnj6DSOgJ8xBtEbNLfzVlfyu9XN0a0Lb+0 LWjt/Uu8STMmcF2Mo5evHRWRFQfj3t8k9OqhIIv/PArXa7WaCnO236PH7z7hgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764979108; a=rsa-sha256; cv=none; b=Tn66k3V+n84inaKpoWjc3HfKFyRHl+HnxHqJy3IWcWwzfwCNsqNCIiKSmGf2/HVIPvjRhp zMwEvH4djaH3quOe8uA/Vft9bjNBOFNZd/0ljhySHyOlKQbAkBw1ya1P9T9No9E7rL/spU lcTLRuMLAomlWi7XaFDQjk6RK668UKIE+MaWFTnFbiBlJ8MSNr43Fc21/RqM87VDjYD/PA 78TGQ6yjsmN+9fN5IaRKHdmA6WrRPUXuOZ9ykfDA6uT/Pce0g0q+E3fO6jnSJv/sWpyMb2 Cbk7ac91fz73nD2pyLudka7C4DDR7XW7W/qfh3F0IlR7enbLszDvxTRJbFXX7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNSxw504nzXd4 for ; Fri, 05 Dec 2025 23:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 940a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 23:58:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 90eda629964c - main - release: Include comms/usbmuxd to DVD to ensure ipheth(4) works List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90eda629964cbe4c2472aa3f1b8a427e60e78834 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 23:58:28 +0000 Message-Id: <693371a4.940a.543a08d0@gitrepo.freebsd.org> The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=90eda629964cbe4c2472aa3f1b8a427e60e78834 commit 90eda629964cbe4c2472aa3f1b8a427e60e78834 Author: Li-Wen Hsu AuthorDate: 2025-12-05 23:57:48 +0000 Commit: Li-Wen Hsu CommitDate: 2025-12-05 23:57:48 +0000 release: Include comms/usbmuxd to DVD to ensure ipheth(4) works PR: 291370 Reviewed by: emaste, aokblast, dch MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54074 --- release/scripts/pkg-stage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index c575f2d32bae..b64fe5e5f1e5 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -14,6 +14,7 @@ export ROOTDIR="$PWD/dvd" export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" +comms/usbmuxd devel/git@lite editors/emacs@nox editors/vim From nobody Sat Dec 6 00:33:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNTkq3Dbgz6Jlby for ; Sat, 06 Dec 2025 00:33: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNTkq2Tv7z4Q9x for ; Sat, 06 Dec 2025 00:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764981235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AJ3cmk+KWrJFsPUjImj/qZfSRl9Gwmxp2yi1UWkVlXM=; b=WA6Q3OK+xbI2xdH0NdXo40vk+RgpJrOISr94GA3fCUoxcwUb+t8Z6yY+QSM8TmDHi2ks+L o2z9eKTn7dmkl0MIRgeAsEJaD3veE1Y+2mYYksr7SsXOLnhBh4Qa8tCyv4Uv2kuK1CIKIA g4qX+gNX4riZydS15ggvvuofz8DI+PdTdTkPxPSOdh7XFxz5LooCz3xw2R6/M/DhCqCP0x cWvt+nscj0fZBUXg6OkIwpA9itjSugs97vH0I3kAsgzzhCFOxccyRhgZ+syvlW1Ei4M269 8xqVXoEO/j33EGmR64KxoVQptS4QVzIT2LXAsWW+bCT4mVJQQZjNuj+fBoXqEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764981235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AJ3cmk+KWrJFsPUjImj/qZfSRl9Gwmxp2yi1UWkVlXM=; b=IZiI7E0FIdMmvURKQhpOcFbNZydjFFi3ngJFcP/sOIwLJl7dMNVA75IwQa56mzkNFeIdi9 10oRPqayfFEw+o48Erl9ZtAXxEmkdneibEsZ/GvyHrCIKq2CTgdOvgoqBvTY+qx+IwObwH TYr4vorP/NoyhmjSI9Nun5IEd1oommvaEt9BKBCsDEQnV7CiH0xmxRCUgR32wtzzrxLkMC 6JHfoAlaF9zcVDnOiXcmU4itqHvCQgPCTFg/+lPTrKUdaCNAL5Se6PaWBV0HR04gfZEZQH PYZSiYrbPGZsfw0bo1+fQecZynMoAY9uuQ7SzZYLF7RLuMfT1JxeWvncBmkaPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764981235; a=rsa-sha256; cv=none; b=rHjoZAG//KZ4IhPir67i2KXn5KGh4wIxcucCd9BZbgETV1x5Y80GAlN4Yc4Xhm1q7t5IY5 YTdd74Wf/FluFdwmHLHzncnKh9vFXfTxYncJHNcclvP0oejR/+oUEUyPBWATIyQhc9cazl UkkGyU9ENCf8z5sWdsU693dXJ4vv6j3R9BLp58tQcxKlCBWcwp6bmxzBqKmj3G00xxTwBJ o8Wzi6mLwhqBNyZbFhknsYZMLp/XBDYDhQHkz+Jp2+MZT/X7MPo4YeZX+i3GJAfEv+pKwb nRgXioS5E+XHbeeFXagUb6ITTblhuAJRfN1kLxjOB07xN9v/y88vnKouvYGJ8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNTkq24VwzYlB for ; Sat, 06 Dec 2025 00:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ccf1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 00:33:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ced74610217f - main - freebsd-update: Mention upgrading packages, not just ports List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ced74610217ff0be071e4614c64a4ff66c40bc6b Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 00:33:55 +0000 Message-Id: <693379f3.ccf1.5070c206@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ced74610217ff0be071e4614c64a4ff66c40bc6b commit ced74610217ff0be071e4614c64a4ff66c40bc6b Author: Jessica Clarke AuthorDate: 2025-12-06 00:33:20 +0000 Commit: Jessica Clarke CommitDate: 2025-12-06 00:33:20 +0000 freebsd-update: Mention upgrading packages, not just ports These days most end users are likely using pre-built packages, not locally-built ports. Thus be sure to mention this as an important case, and put it ahead of ports. Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42968 --- usr.sbin/freebsd-update/freebsd-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index b6e42e94f4bf..aa42af13a302 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3196,8 +3196,8 @@ Kernel updates have been installed. Please reboot and run cat <<-EOF Completing this upgrade requires removing old shared object files. -Please rebuild all installed 3rd party software (e.g., programs -installed from the ports tree) and then run +Please upgrade or rebuild all installed 3rd party software (e.g., +programs installed with pkg or from the ports tree) and then run '`basename $0` [options] install' again to finish installing updates. EOF rm newfiles From nobody Sat Dec 6 09:43:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNjwc6jzSz6KRFM for ; Sat, 06 Dec 2025 09:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNjwc6DWnz3Dy1 for ; Sat, 06 Dec 2025 09:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765014192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgbO6PA2D7IfWl7At1wVNXJfqWdo9sg6GTlz6bWFPAM=; b=mv+g1kPDddo6JhREoHgSE3LPwO23kuRe9k4xn8CiZsJdeU4oAa6Fw6umzhERhs6oGUTU6t TjDx+yBEKtOXpcwB6q8gfLtvcWslDMhB2nJ2FQpdJ6oaMrzuACL5rdvXLa7Xld1N4t7jLt AMnwfJqjzaeQTilOfx6YhqfJVhuwr+C65fTAqE+eBhSbx/bwbkImuiZKQy+CpReakywqLP 9AqHpQAzF8DBZDYvIrb3vXMqGLjS6JtAukAMhQRmb3Ey1dRw1xrFzMG+sXrWvIcz4Gf86I jS9yXh1LFu7+vALYwW633qzSDrjSqc29NG9VDvnmsX0y01D1pK2iLByVoBFWNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765014192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgbO6PA2D7IfWl7At1wVNXJfqWdo9sg6GTlz6bWFPAM=; b=PXEXGX6vcV2HTKwcim5GOreItTsyVS4HbJ26lm8LH7yWePYncrjEEpfissotHqoJmyTjpT soCjfaWdw5SRhXDn+Nha99HVSx+rcxEOP2gqc2j6l7h48Zx8QyVj/dLLl5mw41WhtZGlWB dXhvyA0vqoySiK2rdHn6vVqGkEea5nlbYt+HOcuN5EV3h7ErPjfCM9D3F8Yc69uiGU+Znp tyN80sjA3OKJq7O8SPtHj2pbPhPHPf4Q2k6gqawg4vbiKXMHqoxRhxkGy+77rQiGe0XwKU dOrL5QeTuEqK2yOIswMuUPIRkEk7J2D6l21lfGpDI2XNyeIPWHdA2s5IFe+/AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765014192; a=rsa-sha256; cv=none; b=R0HV2tVF0PosjRDlNSS6x9Zp9oH3suGHIemoNuxC8Fl1uXiojagwEecA6TzjwgoBZVaAEd 7rGIooC4E2XxKmnDILgYP9ANGKO83bt2pvlIh3RzeItA0P4Ii9ggw7VzN+kT9bZnvS+z/u 99z9Wc7Xpjk7X0MEikotQ2vN/Nw9GFtQUwslX9HLdwHwK0ORxQpMS7aNbSszXgzwb8t4E+ grMxA9VzLnBKm9CUwx7XOfVgmdKqJMBp3L0hUXa0wAwZ0deL1a/dzdLWzZ7Lox4CrIyy7W S52T5TIWQaE3U/nGw6PbrOcxsjW2Hv58BgjLUxe9P+iAI+JH/M8ZRpHstnGHyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNjwc5pb8zqvk for ; Sat, 06 Dec 2025 09:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35919 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 09:43:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8b4477f6b8e1 - main - rtw88: update Realtek's rtw88 driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b4477f6b8e1b82acfef558a11facbb2797cb690 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 09:43:07 +0000 Message-Id: <6933faab.35919.55a72886@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4477f6b8e1b82acfef558a11facbb2797cb690 commit 8b4477f6b8e1b82acfef558a11facbb2797cb690 Merge: ced74610217f e543442afe3a Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 09:41:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-06 09:41:49 +0000 rtw88: update Realtek's rtw88 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 ( tag: v6.18 ). Merge commit 'e543442afe3ad5b27616575be2d2402b988656eb' into rtw88 Sponsored by: The FreeBSD Foundation sys/contrib/dev/rtw88/led.c | 13 +++++++------ sys/contrib/dev/rtw88/sdio.c | 4 ++++ 2 files changed, 11 insertions(+), 6 deletions(-) From nobody Sat Dec 6 09:59:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNkHw3c09z6KRxW for ; Sat, 06 Dec 2025 09:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNkHw2XZMz3G9k for ; Sat, 06 Dec 2025 09:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765015196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfBuY6WPLJHG5LAfRMhkOisIFfcGvnJpgw+rWpO4AZU=; b=KkcWwEHwJPxwfTNGfMdbK/hdSQQPcU+RW5AuZJyDdlskpn8tcnJKfTEcrUmemdrkH/Rziw wuPWxQB2SdP//AjsJlM+fOhtSJWs2/TAceiEhJNjkq4RfAenTw8bUnLWSkXxp4RQGTWVZq NZitw5NVOVJ0YIERfqYJH296d22gMKFmsbX/P8zSXIYvG1Z8aNIXZ9k0uQdoTJRCJKs4Zv Hmi3VZrTt5k1c0hny/+jQBCjfoRYY4+unc0S/c446EgOcWoL7JJ53LvdoS+9G92AYmlrfj FAXu6Q3c8G6DxqeO/wQwREhqkvZxFi5D/wMjld+PocGKT8ooYqcV/I2e9rqnRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765015196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfBuY6WPLJHG5LAfRMhkOisIFfcGvnJpgw+rWpO4AZU=; b=XIpAzssVwN1Ee4DzCo88PnsUB38KXGhfkr/GyxLZpRCek9qaWA5jQ0Oo9dwdY93f7M+W7I z0OHVJ3uAHORw+O5Tg2/+eRW/YF2tTCh3Zpig061rtmqBpGix9Doaz9bOVPadszPL/hTTl +MyQDo0CFvgiZ5MJ/qCIAC5tYM93y/8WvwlR02eZ/oKUkvVg+rwjmNgf1oeF2fn6TW95Xw M2RyZvqFnjTCwA8Q1skh3ydYZeDe8RDPpBHg+3m+jNtqKm4t7c41zX9tS0EImt6fVu1WOi 56j3eb0cOTeoP6g2mzmU7V7i+0ArjvJw/lye45elb9ctw5uvOeToCIn+lxEcRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765015196; a=rsa-sha256; cv=none; b=KqETh7Iq9IwhVA9uHQHVgRUoDFFMZVmMyGAr1alA6Z1Cbxkns3Re/a/jNVgBg8AnbD1Cs/ 0uhNPz4b4heIO2eO4F4/8CVk/Ul3oI8SmLIXt/DjWN7nzBVCK5naq2LZWnOAku2EAK8Mae eHm5l3i9CoCf/qfM8L6pUDDHxE3A/jokE0phI1cdk81CZ3RIi07Danb3ZcO0hPl5KyAUId RA1llytDltJs23MtMTfyWZNgObdrkKNtFGwjdY6XEd6rOUXOk9lgH5Roesuc9v/7nPzOW8 GqzdHNpZv+6DlvFbn5P8acoDaF+9y84G2f/wVX3O3AWfkyJ+TbVWzDgt3/cheA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNkHw1pqpzr9Y for ; Sat, 06 Dec 2025 09:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 362f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 09:59:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 28125d24c92a - main - ath-common: update common Atheros/QCA code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28125d24c92a45883b3ab105625ec5b3ba37e320 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 09:59:53 +0000 Message-Id: <6933fe99.362f2.5b09ef@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=28125d24c92a45883b3ab105625ec5b3ba37e320 commit 28125d24c92a45883b3ab105625ec5b3ba37e320 Merge: 8b4477f6b8e1 99ad6f4f54c8 Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 09:47:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-06 09:47:42 +0000 ath-common: update common Atheros/QCA code This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). Merge commit '99ad6f4f54c86845d6e3f03541913c07fcdeef59' sys/contrib/dev/athk/Kconfig | 68 +++++++++++++++++++++++++++++ sys/contrib/dev/athk/Makefile | 25 +++++++++++ sys/contrib/dev/athk/ath.h | 6 ++- sys/contrib/dev/athk/dfs_pattern_detector.c | 21 ++++----- sys/contrib/dev/athk/hw.c | 2 +- sys/contrib/dev/athk/key.c | 4 +- sys/contrib/dev/athk/main.c | 1 + sys/contrib/dev/athk/testmode_i.h | 66 ++++++++++++++++++++++++++++ sys/contrib/dev/athk/trace.h | 4 +- 9 files changed, 177 insertions(+), 20 deletions(-) diff --cc sys/contrib/dev/athk/Kconfig index 000000000000,910c10028b14..910c10028b14 mode 000000,100644..100644 --- a/sys/contrib/dev/athk/Kconfig +++ b/sys/contrib/dev/athk/Kconfig diff --cc sys/contrib/dev/athk/Makefile index 000000000000,000000000000..8d6e6e218d24 new file mode 100644 --- /dev/null +++ b/sys/contrib/dev/athk/Makefile @@@ -1,0 -1,0 +1,25 @@@ ++# SPDX-License-Identifier: ISC ++obj-$(CONFIG_ATH5K) += ath5k/ ++obj-$(CONFIG_ATH9K_HW) += ath9k/ ++obj-$(CONFIG_CARL9170) += carl9170/ ++obj-$(CONFIG_ATH6KL) += ath6kl/ ++obj-$(CONFIG_AR5523) += ar5523/ ++obj-$(CONFIG_WIL6210) += wil6210/ ++obj-$(CONFIG_ATH10K) += ath10k/ ++obj-$(CONFIG_WCN36XX) += wcn36xx/ ++obj-$(CONFIG_ATH11K) += ath11k/ ++obj-$(CONFIG_ATH12K) += ath12k/ ++ ++obj-$(CONFIG_ATH_COMMON) += ath.o ++ ++ath-objs := main.o \ ++ regd.o \ ++ hw.o \ ++ key.o \ ++ dfs_pattern_detector.o \ ++ dfs_pri_detector.o ++ ++ath-$(CONFIG_ATH_DEBUG) += debug.o ++ath-$(CONFIG_ATH_TRACEPOINTS) += trace.o ++ ++CFLAGS_trace.o := -I$(src) diff --cc sys/contrib/dev/athk/testmode_i.h index 000000000000,980ef2f3f05f..980ef2f3f05f mode 000000,100644..100644 --- a/sys/contrib/dev/athk/testmode_i.h +++ b/sys/contrib/dev/athk/testmode_i.h From nobody Sat Dec 6 09:59:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNkHz3Jgrz6KS7K for ; Sat, 06 Dec 2025 09:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNkHz150lz3FxX for ; Sat, 06 Dec 2025 09:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765015199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JiMw1Fje2EwbqoJl7dwTs3ouUMeatUlgSyH+eE/vaDM=; b=yBbfqbRzOYcZ978pPWB6FA8GloU/PaAyka/uyCwxFVZTIp1Z8RsUj//y/Vepb9FS/b4VgT 4QoavSYj0J4xb6gZx0hjTfVtV56t1vbQ1YxsmQoo++j8w34sBZvZCzfZeRbX5jK7EUsMla wBnofkqHEzpYCuYj9QalHb7X1CfUeQsO4Kcfv6e+Pa3f9IrU4zty+B0IFFNptNwPDhNk2/ aSgTDI1DvM5MEN7UCCqUSzUSBDtGBdcOSnOKfuerMpog7P8ce7ewBclszTDBVOJ41g2PKQ TpDLCFP9j7oMgXle9kt2kywMBT6ShBUCPP6imfnXU6YtIFOTK1u/nJiCaS+OWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765015199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JiMw1Fje2EwbqoJl7dwTs3ouUMeatUlgSyH+eE/vaDM=; b=NzIT8xwJpmt84Px6hvRGsgBeM+yNOwgJDMFOB9IdHGoTEvjlKbbPnjqyFZyrZu6tMceTUg C33hNBxKFRRpFb/tm/jm0ZaZQUvKkNUD3F1L7V+dafFTIuQmdh4KYmgmwAlK97Bph7bZc+ k6XnBTi6JuZndXMTA2B9M+fJBA9FdInFrGGPRtdt5tcjUZ41hIoIfA982eB47RRknL6Sz7 Emxl34qTRoGcbjjhsCvoXzgie6E4ADi+9zxmdc4/YUwvPOo20PKw6IihymN7kr3UJfwFX6 /KCyLpspkgpzrilH4mAwJ7X//Eo/ZTJw/sKRHgpQ+mpdHClPooij7LTKBa+zMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765015199; a=rsa-sha256; cv=none; b=CvVdYpzwAT3wWjOeMdDpcFJtmQUlg7lB7YzAe8ytvcGbtKLk6kd7ou2uafYacpDkvbt6Xs l2FLvKmDjsmBa+byL/+WtLvv06ZqmVOP2fWvDyIcZCFLxXe54d/EqTNiBfeZqDar5Peezo s3K0e3vIVJRyqX5yN/I/mbItGOiSsriMMjNjMtQq/JjIaJQ98a+aw7PuNBiUMCVr+aaOHl +4tHiWMdQP5hXocxmIcenJykw7ou+/gnFn2MIdE1kb0OZ5nxklCM0S9EX4UdvHYM3zOgDQ MQ6Dtzj9VTtCv/IbMXlZ0j7AT6TwXRjE4VXRNvHORpJUq6pxAdLsesI3TrwwEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNkHy1msXzr9Z for ; Sat, 06 Dec 2025 09:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35ef8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 09:59:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9954217599ce - main - ath10k: update Atheros/QCA's ath10k driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9954217599ce02fbf1772388e24e0b89663f4425 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 09:59:57 +0000 Message-Id: <6933fe9d.35ef8.4f0c5aeb@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9954217599ce02fbf1772388e24e0b89663f4425 commit 9954217599ce02fbf1772388e24e0b89663f4425 Merge: 28125d24c92a f4669ef6cf78 Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 09:51:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-06 09:51:10 +0000 ath10k: update Atheros/QCA's ath10k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 ( tag: v6.18 ). Merge commit 'f4669ef6cf7860919442e67106e83f616ed36f51'. Sponsored by: The FreeBSD Foundation sys/contrib/dev/athk/ath10k/Kconfig | 7 + sys/contrib/dev/athk/ath10k/Makefile | 1 + sys/contrib/dev/athk/ath10k/ahb.c | 30 ++-- sys/contrib/dev/athk/ath10k/bmi.c | 9 +- sys/contrib/dev/athk/ath10k/ce.c | 35 ++-- sys/contrib/dev/athk/ath10k/ce.h | 2 +- sys/contrib/dev/athk/ath10k/core.c | 174 ++++++++++++++----- sys/contrib/dev/athk/ath10k/core.h | 28 ++- sys/contrib/dev/athk/ath10k/coredump.c | 3 + sys/contrib/dev/athk/ath10k/coredump.h | 7 +- sys/contrib/dev/athk/ath10k/debug.c | 62 +++---- sys/contrib/dev/athk/ath10k/debugfs_sta.c | 10 +- sys/contrib/dev/athk/ath10k/htc.c | 10 +- sys/contrib/dev/athk/ath10k/htc.h | 20 +-- sys/contrib/dev/athk/ath10k/htt.c | 3 +- sys/contrib/dev/athk/ath10k/htt.h | 18 +- sys/contrib/dev/athk/ath10k/htt_rx.c | 22 ++- sys/contrib/dev/athk/ath10k/htt_tx.c | 26 ++- sys/contrib/dev/athk/ath10k/hw.c | 64 +++---- sys/contrib/dev/athk/ath10k/hw.h | 63 ++++--- sys/contrib/dev/athk/ath10k/leds.c | 89 ++++++++++ sys/contrib/dev/athk/ath10k/leds.h | 34 ++++ sys/contrib/dev/athk/ath10k/mac.c | 265 ++++++++++++++++++----------- sys/contrib/dev/athk/ath10k/pci.c | 86 +++++----- sys/contrib/dev/athk/ath10k/pci.h | 7 +- sys/contrib/dev/athk/ath10k/qmi.c | 12 ++ sys/contrib/dev/athk/ath10k/qmi.h | 1 + sys/contrib/dev/athk/ath10k/qmi_wlfw_v01.c | 1 + sys/contrib/dev/athk/ath10k/qmi_wlfw_v01.h | 1 + sys/contrib/dev/athk/ath10k/rx_desc.h | 1 + sys/contrib/dev/athk/ath10k/sdio.c | 37 ++-- sys/contrib/dev/athk/ath10k/snoc.c | 60 ++++--- sys/contrib/dev/athk/ath10k/spectral.c | 26 +-- sys/contrib/dev/athk/ath10k/targaddrs.h | 3 + sys/contrib/dev/athk/ath10k/testmode.c | 4 +- sys/contrib/dev/athk/ath10k/thermal.c | 3 +- sys/contrib/dev/athk/ath10k/trace.c | 2 + sys/contrib/dev/athk/ath10k/trace.h | 64 +++---- sys/contrib/dev/athk/ath10k/txrx.c | 2 +- sys/contrib/dev/athk/ath10k/usb.c | 8 +- sys/contrib/dev/athk/ath10k/usb.h | 1 + sys/contrib/dev/athk/ath10k/wmi-ops.h | 32 ++++ sys/contrib/dev/athk/ath10k/wmi-tlv.c | 20 ++- sys/contrib/dev/athk/ath10k/wmi-tlv.h | 3 +- sys/contrib/dev/athk/ath10k/wmi.c | 122 ++++++++++--- sys/contrib/dev/athk/ath10k/wmi.h | 104 ++++++----- sys/contrib/dev/athk/ath10k/wow.c | 1 + 47 files changed, 1009 insertions(+), 574 deletions(-) diff --cc sys/contrib/dev/athk/ath10k/Makefile index 7881fc25993f,000000000000..28460625cdfb mode 100644,000000..100644 --- a/sys/contrib/dev/athk/ath10k/Makefile +++ b/sys/contrib/dev/athk/ath10k/Makefile @@@ -1,45 -1,0 +1,46 @@@ +# SPDX-License-Identifier: ISC +obj-$(CONFIG_ATH10K) += ath10k_core.o +ath10k_core-y += mac.o \ + debug.o \ + core.o \ + htc.o \ + htt.o \ + htt_rx.o \ + htt_tx.o \ + txrx.o \ + wmi.o \ + wmi-tlv.o \ + bmi.o \ + hw.o \ + p2p.o \ + swap.o + +ath10k_core-$(CONFIG_ATH10K_SPECTRAL) += spectral.o +ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o +ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o +ath10k_core-$(CONFIG_THERMAL) += thermal.o ++ath10k_core-$(CONFIG_ATH10K_LEDS) += leds.o +ath10k_core-$(CONFIG_MAC80211_DEBUGFS) += debugfs_sta.o +ath10k_core-$(CONFIG_PM) += wow.o +ath10k_core-$(CONFIG_DEV_COREDUMP) += coredump.o +ath10k_core-$(CONFIG_ATH10K_CE) += ce.o +ath10k_core-${CONFIG_FWLOG) += fwlog.o + +obj-$(CONFIG_ATH10K_PCI) += ath10k_pci.o +ath10k_pci-y += pci.o + +ath10k_pci-$(CONFIG_ATH10K_AHB) += ahb.o + +obj-$(CONFIG_ATH10K_SDIO) += ath10k_sdio.o +ath10k_sdio-y += sdio.o + +obj-$(CONFIG_ATH10K_USB) += ath10k_usb.o +ath10k_usb-y += usb.o + +obj-$(CONFIG_ATH10K_SNOC) += ath10k_snoc.o +ath10k_snoc-y += qmi.o \ + qmi_wlfw_v01.o \ + snoc.o + +# for tracing framework to find trace.h +CFLAGS_trace.o := -I$(src) diff --cc sys/contrib/dev/athk/ath10k/ce.c index 8168e20bb09a,000000000000..719957ac87e4 mode 100644,000000..100644 --- a/sys/contrib/dev/athk/ath10k/ce.c +++ b/sys/contrib/dev/athk/ath10k/ce.c @@@ -1,1972 -1,0 +1,1975 @@@ +// SPDX-License-Identifier: ISC +/* + * Copyright (c) 2005-2011 Atheros Communications Inc. + * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. + * Copyright (c) 2018 The Linux Foundation. All rights reserved. ++ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. ++ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + ++#include +#include "hif.h" +#include "ce.h" +#include "debug.h" + +/* + * Support for Copy Engine hardware, which is mainly used for + * communication between Host and Target over a PCIe interconnect. + */ + +/* + * A single CopyEngine (CE) comprises two "rings": + * a source ring + * a destination ring + * + * Each ring consists of a number of descriptors which specify + * an address, length, and meta-data. + * + * Typically, one side of the PCIe/AHB/SNOC interconnect (Host or Target) + * controls one ring and the other side controls the other ring. + * The source side chooses when to initiate a transfer and it + * chooses what to send (buffer address, length). The destination + * side keeps a supply of "anonymous receive buffers" available and + * it handles incoming data as it arrives (when the destination + * receives an interrupt). + * + * The sender may send a simple buffer (address/length) or it may + * send a small list of buffers. When a small list is sent, hardware + * "gathers" these and they end up in a single destination buffer + * with a single interrupt. + * + * There are several "contexts" managed by this layer -- more, it + * may seem -- than should be needed. These are provided mainly for + * maximum flexibility and especially to facilitate a simpler HIF + * implementation. There are per-CopyEngine recv, send, and watermark + * contexts. These are supplied by the caller when a recv, send, + * or watermark handler is established and they are echoed back to + * the caller when the respective callbacks are invoked. There is + * also a per-transfer context supplied by the caller when a buffer + * (or sendlist) is sent and when a buffer is enqueued for recv. + * These per-transfer contexts are echoed back to the caller when + * the buffer is sent/received. + */ + +static inline u32 shadow_sr_wr_ind_addr(struct ath10k *ar, + struct ath10k_ce_pipe *ce_state) +{ + u32 ce_id = ce_state->id; + u32 addr = 0; + + switch (ce_id) { + case 0: + addr = 0x00032000; + break; + case 3: + addr = 0x0003200C; + break; + case 4: + addr = 0x00032010; + break; + case 5: + addr = 0x00032014; + break; + case 7: + addr = 0x0003201C; + break; + default: + ath10k_warn(ar, "invalid CE id: %d", ce_id); + break; + } + return addr; +} + +static inline unsigned int +ath10k_set_ring_byte(unsigned int offset, - struct ath10k_hw_ce_regs_addr_map *addr_map) ++ const struct ath10k_hw_ce_regs_addr_map *addr_map) +{ + return ((offset << addr_map->lsb) & addr_map->mask); +} + +static inline u32 ath10k_ce_read32(struct ath10k *ar, u32 offset) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + + return ce->bus_ops->read32(ar, offset); +} + +static inline void ath10k_ce_write32(struct ath10k *ar, u32 offset, u32 value) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + + ce->bus_ops->write32(ar, offset, value); +} + +static inline void ath10k_ce_dest_ring_write_index_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dst_wr_index_addr, n); +} + +static inline u32 ath10k_ce_dest_ring_write_index_get(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + return ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dst_wr_index_addr); +} + +static inline void ath10k_ce_src_ring_write_index_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_wr_index_addr, n); +} + +static inline u32 ath10k_ce_src_ring_write_index_get(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + return ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_wr_index_addr); +} + +static inline u32 ath10k_ce_src_ring_read_index_from_ddr(struct ath10k *ar, + u32 ce_id) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + + return ce->vaddr_rri[ce_id] & CE_DDR_RRI_MASK; +} + +static inline u32 ath10k_ce_src_ring_read_index_get(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + u32 ce_id = COPY_ENGINE_ID(ce_ctrl_addr); + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id]; + u32 index; + + if (ar->hw_params.rri_on_ddr && + (ce_state->attr_flags & CE_ATTR_DIS_INTR)) + index = ath10k_ce_src_ring_read_index_from_ddr(ar, ce_id); + else + index = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->current_srri_addr); + + return index; +} + +static inline void +ath10k_ce_shadow_src_ring_write_index_set(struct ath10k *ar, + struct ath10k_ce_pipe *ce_state, + unsigned int value) +{ + ath10k_ce_write32(ar, shadow_sr_wr_ind_addr(ar, ce_state), value); +} + +static inline void ath10k_ce_src_ring_base_addr_set(struct ath10k *ar, + u32 ce_id, + u64 addr) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id]; + u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id); + u32 addr_lo = lower_32_bits(addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_base_addr_lo, addr_lo); + + if (ce_state->ops->ce_set_src_ring_base_addr_hi) { + ce_state->ops->ce_set_src_ring_base_addr_hi(ar, ce_ctrl_addr, + addr); + } +} + +static void ath10k_ce_set_src_ring_base_addr_hi(struct ath10k *ar, + u32 ce_ctrl_addr, + u64 addr) +{ + u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK; + + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_base_addr_hi, addr_hi); +} + +static inline void ath10k_ce_src_ring_size_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_size_addr, n); +} + +static inline void ath10k_ce_src_ring_dmax_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ - struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs; ++ const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs; + + u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ctrl_regs->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ctrl_regs->addr, + (ctrl1_addr & ~(ctrl_regs->dmax->mask)) | + ath10k_set_ring_byte(n, ctrl_regs->dmax)); +} + +static inline void ath10k_ce_src_ring_byte_swap_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ - struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs; ++ const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs; + + u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ctrl_regs->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ctrl_regs->addr, + (ctrl1_addr & ~(ctrl_regs->src_ring->mask)) | + ath10k_set_ring_byte(n, ctrl_regs->src_ring)); +} + +static inline void ath10k_ce_dest_ring_byte_swap_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ - struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs; ++ const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs; + + u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ctrl_regs->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ctrl_regs->addr, + (ctrl1_addr & ~(ctrl_regs->dst_ring->mask)) | + ath10k_set_ring_byte(n, ctrl_regs->dst_ring)); +} + +static inline + u32 ath10k_ce_dest_ring_read_index_from_ddr(struct ath10k *ar, u32 ce_id) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + + return (ce->vaddr_rri[ce_id] >> CE_DDR_DRRI_SHIFT) & + CE_DDR_RRI_MASK; +} + +static inline u32 ath10k_ce_dest_ring_read_index_get(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + u32 ce_id = COPY_ENGINE_ID(ce_ctrl_addr); + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id]; + u32 index; + + if (ar->hw_params.rri_on_ddr && + (ce_state->attr_flags & CE_ATTR_DIS_INTR)) + index = ath10k_ce_dest_ring_read_index_from_ddr(ar, ce_id); + else + index = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->current_drri_addr); + + return index; +} + +static inline void ath10k_ce_dest_ring_base_addr_set(struct ath10k *ar, + u32 ce_id, + u64 addr) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id]; + u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id); + u32 addr_lo = lower_32_bits(addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dr_base_addr_lo, addr_lo); + + if (ce_state->ops->ce_set_dest_ring_base_addr_hi) { + ce_state->ops->ce_set_dest_ring_base_addr_hi(ar, ce_ctrl_addr, + addr); + } +} + +static void ath10k_ce_set_dest_ring_base_addr_hi(struct ath10k *ar, + u32 ce_ctrl_addr, + u64 addr) +{ + u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK; + u32 reg_value; + + reg_value = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dr_base_addr_hi); + reg_value &= ~CE_DESC_ADDR_HI_MASK; + reg_value |= addr_hi; + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dr_base_addr_hi, reg_value); +} + +static inline void ath10k_ce_dest_ring_size_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dr_size_addr, n); +} + +static inline void ath10k_ce_src_ring_highmark_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ - struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr; ++ const struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr; + u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + srcr_wm->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + srcr_wm->addr, + (addr & ~(srcr_wm->wm_high->mask)) | + (ath10k_set_ring_byte(n, srcr_wm->wm_high))); +} + +static inline void ath10k_ce_src_ring_lowmark_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ - struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr; ++ const struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr; + u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + srcr_wm->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + srcr_wm->addr, + (addr & ~(srcr_wm->wm_low->mask)) | + (ath10k_set_ring_byte(n, srcr_wm->wm_low))); +} + +static inline void ath10k_ce_dest_ring_highmark_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ - struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr; ++ const struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr; + u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + dstr_wm->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + dstr_wm->addr, + (addr & ~(dstr_wm->wm_high->mask)) | + (ath10k_set_ring_byte(n, dstr_wm->wm_high))); +} + +static inline void ath10k_ce_dest_ring_lowmark_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ - struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr; ++ const struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr; + u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + dstr_wm->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + dstr_wm->addr, + (addr & ~(dstr_wm->wm_low->mask)) | + (ath10k_set_ring_byte(n, dstr_wm->wm_low))); +} + +static inline void ath10k_ce_copy_complete_inter_enable(struct ath10k *ar, + u32 ce_ctrl_addr) +{ - struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie; ++ const struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie; + + u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->host_ie_addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ar->hw_ce_regs->host_ie_addr, + host_ie_addr | host_ie->copy_complete->mask); +} + +static inline void ath10k_ce_copy_complete_intr_disable(struct ath10k *ar, + u32 ce_ctrl_addr) +{ - struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie; ++ const struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie; + + u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->host_ie_addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ar->hw_ce_regs->host_ie_addr, + host_ie_addr & ~(host_ie->copy_complete->mask)); +} + +static inline void ath10k_ce_watermark_intr_disable(struct ath10k *ar, + u32 ce_ctrl_addr) +{ - struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs; ++ const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs; + + u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->host_ie_addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ar->hw_ce_regs->host_ie_addr, + host_ie_addr & ~(wm_regs->wm_mask)); +} + +static inline void ath10k_ce_error_intr_disable(struct ath10k *ar, + u32 ce_ctrl_addr) +{ - struct ath10k_hw_ce_misc_regs *misc_regs = ar->hw_ce_regs->misc_regs; ++ const struct ath10k_hw_ce_misc_regs *misc_regs = ar->hw_ce_regs->misc_regs; + + u32 misc_ie_addr = ath10k_ce_read32(ar, + ce_ctrl_addr + ar->hw_ce_regs->misc_ie_addr); + + ath10k_ce_write32(ar, + ce_ctrl_addr + ar->hw_ce_regs->misc_ie_addr, + misc_ie_addr & ~(misc_regs->err_mask)); +} + +static inline void ath10k_ce_engine_int_status_clear(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int mask) +{ - struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs; ++ const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs; + + ath10k_ce_write32(ar, ce_ctrl_addr + wm_regs->addr, mask); +} + +/* + * Guts of ath10k_ce_send. + * The caller takes responsibility for any needed locking. + */ +static int _ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state, + void *per_transfer_context, + dma_addr_t buffer, + unsigned int nbytes, + unsigned int transfer_id, + unsigned int flags) +{ + struct ath10k *ar = ce_state->ar; + struct ath10k_ce_ring *src_ring = ce_state->src_ring; + struct ce_desc *desc, sdesc; + unsigned int nentries_mask = src_ring->nentries_mask; + unsigned int sw_index = src_ring->sw_index; + unsigned int write_index = src_ring->write_index; + u32 ctrl_addr = ce_state->ctrl_addr; + u32 desc_flags = 0; + int ret = 0; + + if (nbytes > ce_state->src_sz_max) + ath10k_warn(ar, "%s: send more we can (nbytes: %d, max: %d)\n", + __func__, nbytes, ce_state->src_sz_max); + + if (unlikely(CE_RING_DELTA(nentries_mask, + write_index, sw_index - 1) <= 0)) { + ret = -ENOSR; + goto exit; + } + + desc = CE_SRC_RING_TO_DESC(src_ring->base_addr_owner_space, + write_index); + + desc_flags |= SM(transfer_id, CE_DESC_FLAGS_META_DATA); + + if (flags & CE_SEND_FLAG_GATHER) + desc_flags |= CE_DESC_FLAGS_GATHER; + if (flags & CE_SEND_FLAG_BYTE_SWAP) + desc_flags |= CE_DESC_FLAGS_BYTE_SWAP; + + sdesc.addr = __cpu_to_le32(buffer); + sdesc.nbytes = __cpu_to_le16(nbytes); + sdesc.flags = __cpu_to_le16(desc_flags); + + *desc = sdesc; + + src_ring->per_transfer_context[write_index] = per_transfer_context; + + /* Update Source Ring Write Index */ + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + + /* WORKAROUND */ + if (!(flags & CE_SEND_FLAG_GATHER)) + ath10k_ce_src_ring_write_index_set(ar, ctrl_addr, write_index); + + src_ring->write_index = write_index; +exit: + return ret; +} + +static int _ath10k_ce_send_nolock_64(struct ath10k_ce_pipe *ce_state, + void *per_transfer_context, + dma_addr_t buffer, + unsigned int nbytes, + unsigned int transfer_id, + unsigned int flags) +{ + struct ath10k *ar = ce_state->ar; + struct ath10k_ce_ring *src_ring = ce_state->src_ring; + struct ce_desc_64 *desc, sdesc; + unsigned int nentries_mask = src_ring->nentries_mask; + unsigned int sw_index; + unsigned int write_index = src_ring->write_index; + u32 ctrl_addr = ce_state->ctrl_addr; + __le32 *addr; + u32 desc_flags = 0; + int ret = 0; + + if (test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags)) + return -ESHUTDOWN; + + if (nbytes > ce_state->src_sz_max) + ath10k_warn(ar, "%s: send more we can (nbytes: %d, max: %d)\n", + __func__, nbytes, ce_state->src_sz_max); + + if (ar->hw_params.rri_on_ddr) + sw_index = ath10k_ce_src_ring_read_index_from_ddr(ar, ce_state->id); + else + sw_index = src_ring->sw_index; + + if (unlikely(CE_RING_DELTA(nentries_mask, + write_index, sw_index - 1) <= 0)) { + ret = -ENOSR; + goto exit; + } + + desc = CE_SRC_RING_TO_DESC_64(src_ring->base_addr_owner_space, + write_index); + + desc_flags |= SM(transfer_id, CE_DESC_FLAGS_META_DATA); + + if (flags & CE_SEND_FLAG_GATHER) + desc_flags |= CE_DESC_FLAGS_GATHER; + + if (flags & CE_SEND_FLAG_BYTE_SWAP) + desc_flags |= CE_DESC_FLAGS_BYTE_SWAP; + + addr = (__le32 *)&sdesc.addr; + + flags |= upper_32_bits(buffer) & CE_DESC_ADDR_HI_MASK; + addr[0] = __cpu_to_le32(buffer); + addr[1] = __cpu_to_le32(flags); + if (flags & CE_SEND_FLAG_GATHER) + addr[1] |= __cpu_to_le32(CE_WCN3990_DESC_FLAGS_GATHER); + else + addr[1] &= ~(__cpu_to_le32(CE_WCN3990_DESC_FLAGS_GATHER)); + + sdesc.nbytes = __cpu_to_le16(nbytes); + sdesc.flags = __cpu_to_le16(desc_flags); + + *desc = sdesc; + + src_ring->per_transfer_context[write_index] = per_transfer_context; + + /* Update Source Ring Write Index */ + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + + if (!(flags & CE_SEND_FLAG_GATHER)) { + if (ar->hw_params.shadow_reg_support) + ath10k_ce_shadow_src_ring_write_index_set(ar, ce_state, + write_index); + else + ath10k_ce_src_ring_write_index_set(ar, ctrl_addr, + write_index); + } + + src_ring->write_index = write_index; +exit: + return ret; +} + +int ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state, + void *per_transfer_context, + dma_addr_t buffer, + unsigned int nbytes, + unsigned int transfer_id, + unsigned int flags) +{ + return ce_state->ops->ce_send_nolock(ce_state, per_transfer_context, + buffer, nbytes, transfer_id, flags); +} +EXPORT_SYMBOL(ath10k_ce_send_nolock); + +void __ath10k_ce_send_revert(struct ath10k_ce_pipe *pipe) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_ring *src_ring = pipe->src_ring; + u32 ctrl_addr = pipe->ctrl_addr; + + lockdep_assert_held(&ce->ce_lock); + + /* + * This function must be called only if there is an incomplete + * scatter-gather transfer (before index register is updated) + * that needs to be cleaned up. + */ + if (WARN_ON_ONCE(src_ring->write_index == src_ring->sw_index)) + return; + + if (WARN_ON_ONCE(src_ring->write_index == + ath10k_ce_src_ring_write_index_get(ar, ctrl_addr))) + return; + + src_ring->write_index--; + src_ring->write_index &= src_ring->nentries_mask; + + src_ring->per_transfer_context[src_ring->write_index] = NULL; +} +EXPORT_SYMBOL(__ath10k_ce_send_revert); + +int ath10k_ce_send(struct ath10k_ce_pipe *ce_state, + void *per_transfer_context, + dma_addr_t buffer, + unsigned int nbytes, + unsigned int transfer_id, + unsigned int flags) +{ + struct ath10k *ar = ce_state->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + int ret; + + spin_lock_bh(&ce->ce_lock); + ret = ath10k_ce_send_nolock(ce_state, per_transfer_context, + buffer, nbytes, transfer_id, flags); + spin_unlock_bh(&ce->ce_lock); + + return ret; +} +EXPORT_SYMBOL(ath10k_ce_send); + +int ath10k_ce_num_free_src_entries(struct ath10k_ce_pipe *pipe) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + int delta; + + spin_lock_bh(&ce->ce_lock); + delta = CE_RING_DELTA(pipe->src_ring->nentries_mask, + pipe->src_ring->write_index, + pipe->src_ring->sw_index - 1); + spin_unlock_bh(&ce->ce_lock); + + return delta; +} +EXPORT_SYMBOL(ath10k_ce_num_free_src_entries); + +int __ath10k_ce_rx_num_free_bufs(struct ath10k_ce_pipe *pipe) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_ring *dest_ring = pipe->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int write_index = dest_ring->write_index; + unsigned int sw_index = dest_ring->sw_index; + + lockdep_assert_held(&ce->ce_lock); + + return CE_RING_DELTA(nentries_mask, write_index, sw_index - 1); +} +EXPORT_SYMBOL(__ath10k_ce_rx_num_free_bufs); + +static int __ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, + dma_addr_t paddr) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_ring *dest_ring = pipe->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int write_index = dest_ring->write_index; + unsigned int sw_index = dest_ring->sw_index; + struct ce_desc *base = dest_ring->base_addr_owner_space; + struct ce_desc *desc = CE_DEST_RING_TO_DESC(base, write_index); + u32 ctrl_addr = pipe->ctrl_addr; + + lockdep_assert_held(&ce->ce_lock); + + if ((pipe->id != 5) && + CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) == 0) + return -ENOSPC; + + desc->addr = __cpu_to_le32(paddr); + desc->nbytes = 0; + + dest_ring->per_transfer_context[write_index] = ctx; + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + ath10k_ce_dest_ring_write_index_set(ar, ctrl_addr, write_index); + dest_ring->write_index = write_index; + + return 0; +} + +static int __ath10k_ce_rx_post_buf_64(struct ath10k_ce_pipe *pipe, + void *ctx, + dma_addr_t paddr) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_ring *dest_ring = pipe->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int write_index = dest_ring->write_index; + unsigned int sw_index = dest_ring->sw_index; + struct ce_desc_64 *base = dest_ring->base_addr_owner_space; + struct ce_desc_64 *desc = + CE_DEST_RING_TO_DESC_64(base, write_index); + u32 ctrl_addr = pipe->ctrl_addr; + + lockdep_assert_held(&ce->ce_lock); + + if (CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) == 0) + return -ENOSPC; + + desc->addr = __cpu_to_le64(paddr); + desc->addr &= __cpu_to_le64(CE_DESC_ADDR_MASK); + + desc->nbytes = 0; + + dest_ring->per_transfer_context[write_index] = ctx; + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + ath10k_ce_dest_ring_write_index_set(ar, ctrl_addr, write_index); + dest_ring->write_index = write_index; + + return 0; +} + +void ath10k_ce_rx_update_write_idx(struct ath10k_ce_pipe *pipe, u32 nentries) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce_ring *dest_ring = pipe->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int write_index = dest_ring->write_index; + u32 ctrl_addr = pipe->ctrl_addr; + u32 cur_write_idx = ath10k_ce_dest_ring_write_index_get(ar, ctrl_addr); + + /* Prevent CE ring stuck issue that will occur when ring is full. + * Make sure that write index is 1 less than read index. + */ + if (((cur_write_idx + nentries) & nentries_mask) == dest_ring->sw_index) + nentries -= 1; + + write_index = CE_RING_IDX_ADD(nentries_mask, write_index, nentries); + ath10k_ce_dest_ring_write_index_set(ar, ctrl_addr, write_index); + dest_ring->write_index = write_index; +} +EXPORT_SYMBOL(ath10k_ce_rx_update_write_idx); + +int ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, + dma_addr_t paddr) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + int ret; + + spin_lock_bh(&ce->ce_lock); + ret = pipe->ops->ce_rx_post_buf(pipe, ctx, paddr); + spin_unlock_bh(&ce->ce_lock); + + return ret; +} +EXPORT_SYMBOL(ath10k_ce_rx_post_buf); + +/* + * Guts of ath10k_ce_completed_recv_next. + * The caller takes responsibility for any necessary locking. + */ +static int + _ath10k_ce_completed_recv_next_nolock(struct ath10k_ce_pipe *ce_state, + void **per_transfer_contextp, + unsigned int *nbytesp) +{ + struct ath10k_ce_ring *dest_ring = ce_state->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int sw_index = dest_ring->sw_index; + + struct ce_desc *base = dest_ring->base_addr_owner_space; + struct ce_desc *desc = CE_DEST_RING_TO_DESC(base, sw_index); + struct ce_desc sdesc; + u16 nbytes; + + /* Copy in one go for performance reasons */ + sdesc = *desc; + + nbytes = __le16_to_cpu(sdesc.nbytes); + if (nbytes == 0) { + /* + * This closes a relatively unusual race where the Host + * sees the updated DRRI before the update to the + * corresponding descriptor has completed. We treat this + * as a descriptor that is not yet done. + */ + return -EIO; + } + + desc->nbytes = 0; + + /* Return data from completed destination descriptor */ + *nbytesp = nbytes; + + if (per_transfer_contextp) + *per_transfer_contextp = + dest_ring->per_transfer_context[sw_index]; + + /* Copy engine 5 (HTT Rx) will reuse the same transfer context. + * So update transfer context all CEs except CE5. + */ + if (ce_state->id != 5) + dest_ring->per_transfer_context[sw_index] = NULL; + + /* Update sw_index */ + sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); + dest_ring->sw_index = sw_index; + + return 0; +} + +static int +_ath10k_ce_completed_recv_next_nolock_64(struct ath10k_ce_pipe *ce_state, + void **per_transfer_contextp, + unsigned int *nbytesp) +{ + struct ath10k_ce_ring *dest_ring = ce_state->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int sw_index = dest_ring->sw_index; + struct ce_desc_64 *base = dest_ring->base_addr_owner_space; + struct ce_desc_64 *desc = + CE_DEST_RING_TO_DESC_64(base, sw_index); + struct ce_desc_64 sdesc; + u16 nbytes; + + /* Copy in one go for performance reasons */ + sdesc = *desc; + + nbytes = __le16_to_cpu(sdesc.nbytes); + if (nbytes == 0) { + /* This closes a relatively unusual race where the Host + * sees the updated DRRI before the update to the + * corresponding descriptor has completed. We treat this + * as a descriptor that is not yet done. + */ + return -EIO; + } + + desc->nbytes = 0; + + /* Return data from completed destination descriptor */ + *nbytesp = nbytes; + + if (per_transfer_contextp) + *per_transfer_contextp = + dest_ring->per_transfer_context[sw_index]; + + /* Copy engine 5 (HTT Rx) will reuse the same transfer context. + * So update transfer context all CEs except CE5. + */ + if (ce_state->id != 5) + dest_ring->per_transfer_context[sw_index] = NULL; *** 36221 LINES SKIPPED *** From nobody Sat Dec 6 09:59:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNkHz6727z6KS2m for ; Sat, 06 Dec 2025 09:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNkHz3VvHz3GPj for ; Sat, 06 Dec 2025 09:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765015199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WfELqmgmpbMiZ4J+yN1W0VEd185vrMRmbnGL+Za/tfY=; b=OnoViT0MzzvvqM6l823T515NB0/e4GqWYRbV0aLDbuDikfK3eaxw4wd4H62qYd0rYGLHVz nZhux1OnfUS+niwhdOTPhhl/cak6eclLUgG7brEYbCHrLBFOzvqE/HypzNceYuFuC7BZCY nzLmHvlPhO8ukich+RHriJODMAgZv+zWRoXkdgwzhIt/5rTxY7+YQ0SAlU+haqOjKQ5m63 p0uWdEDg16EORDW7DRYRm4Xnr3S8lr5ey1zEEGK6BfzmC7Vj35XCo9OoWBlB4U/ZepW8l6 0ttTNoOTX9JTFnOaukC/p/4nUE4pmLQzxDC3P7CUyRd+528QHCihNXaeBNU8dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765015199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WfELqmgmpbMiZ4J+yN1W0VEd185vrMRmbnGL+Za/tfY=; b=o6A7kEHjKf4dZDj3se4Y6z5tA8hR7iB6W//dI5aQ4j2y/St0rbI8JjEKIjWissA10/42UK gPO1cq23HnIiJhIWvWeenUQ69Wy5QgSv9SjdQ7HdpN+3enLNz+RC3zG+WF5HtBksrbjsgC jjEwa8aetr4zPTXPBOoflu/UTT3DPUIsvmK7yqxME5Kg2x9YgWCy+UhzSBnd7ewu5VZ+hT cfXSrElcniiXs8G6iW1SEhRzjHvJztm/YR0eNS9yc/G9yuUAOpa8fH1K35Vd1k+/9aeS4+ obfJFva1azCjLig7EHSXOoCpBUMNLwEltpuveaYrDkbLQZma/c6BrfDEjwkkVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765015199; a=rsa-sha256; cv=none; b=Bz8MMER94u8dkwG4QZaWJdWFHvVsJzS0tVP/p9z2ecAKa8dxj5waODjgHXl9TLwJYUm4Ux mFRpgCOHMnMTOtxb1SIfPMRE7+O4ntJYpjfvzelAduv13tcOWuMygvj0FxC07GTCLH2zC+ KhoK9rGcQJYpOv9BiV0SFaqLv0azdLdLtgmWyvXXwBG6yT+93kYBZgUJgtMi7abrYPSbSn g7581cCFKAiPx8LaNrKyfILfXZXZ1yi/X71Dv0AbWzQ9h+Uhq6mCGrbFUuEx0IBWkfEQ3S /kZ3X9YZsnmJfeb6yZzkkbBwbcMs5NPCt5Lz89/VqlAU9bGD0csPjWIvB8kfBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNkHz2YLxzrXX for ; Sat, 06 Dec 2025 09:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 361e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 09:59:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: fe7b6fc32455 - main - LinuxKPI: ath10k: adjust for led changes to keep ath10k compiling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe7b6fc32455389d1b8452c67e1ddcfbc4e5f5cc Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 09:59:59 +0000 Message-Id: <6933fe9f.361e8.42a2de9e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fe7b6fc32455389d1b8452c67e1ddcfbc4e5f5cc commit fe7b6fc32455389d1b8452c67e1ddcfbc4e5f5cc Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 09:57:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-06 09:59:11 +0000 LinuxKPI: ath10k: adjust for led changes to keep ath10k compiling Add the conditional compile time option defaulting to off as we do not support leds in LinuxKPI to ath10k for the new file. Add empty struct gpio_led to LinuxKPI. MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/leds.h | 5 ++++- sys/modules/ath10k/Makefile | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/leds.h b/sys/compat/linuxkpi/common/include/linux/leds.h index 89f7286f6800..b9b694f6e304 100644 --- a/sys/compat/linuxkpi/common/include/linux/leds.h +++ b/sys/compat/linuxkpi/common/include/linux/leds.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2022 Bjoern A. Zeeb + * Copyright (c) 2022-2025 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -38,4 +38,7 @@ struct led_classdev { void (*led_set)(struct led_classdev *, enum led_brightness); }; +struct gpio_led { +}; + #endif /* _LINUXKPI_LINUX_LEDS_H */ diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index eb02bda1699f..98df270b6791 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -3,6 +3,7 @@ DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} WITH_CONFIG_FWLOG= 1 +WITH_LEDS= 0 KMOD= if_ath10k @@ -22,6 +23,11 @@ SRCS+= fwlog.c CFLAGS+= -DCONFIG_FWLOG=${WITH_CONFIG_FWLOG} .endif +.if defined(WITH_LEDS) && ${WITH_LEDS} > 0 +CFLAGS+= -DCONFIG_ATH10K_LEDS +SRCS+= leds.c +.endif + CFLAGS+= -DKBUILD_MODNAME='"ath10k"' CFLAGS+= -I${DEVATH10KDIR} From nobody Sat Dec 6 10:22:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNkpS0vXqz6KTZ0 for ; Sat, 06 Dec 2025 10:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNkpS0Spxz3KB8 for ; Sat, 06 Dec 2025 10:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765016576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZlHQzEDNtcYhKlPFsM4jol7XOU4Zd9U+oq9+6Q2+pY=; b=Ga1nOqOtG2aNe5nVR3ePxK0h6Jp3+WTYmuKX/yus71+OunlE6t1DViiix3NKhcgxy/Fr6A pjBRQvCXkOIJr3ltiKQDztDXbchR/uB43CNB7EJq1v41kTwjsX8MA4thrsmK59iA63evdM 6gsHQwyd1uxgViGMpntQLGKK5/T3e+4ZKccBlh08nuAsNZx8NGNt9AT9f3QEYSe167ttCT 9AVH+RlT2R85MdQe8ujYQdkBdXx3XJ92W3oDrFh2F3jVTnqLu3X8kjFJtiyVcx2yxfxMwW oDwec/yLvLF3GLixLoSajd3DvCzzTrZXZT/IjU4lfpAux49EY41OvTx5L73pGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765016576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZlHQzEDNtcYhKlPFsM4jol7XOU4Zd9U+oq9+6Q2+pY=; b=nhjyGPgs0sQkSRhEpkQZyc5tXykAb1pvt95OVh8bTrcneL82BgmZ4VHqD4gzR+n7W/OygX ZjdeSRsVgUopoagb2bvsJ4CZDQ01/iF0N0nyQ6/MXak+6J1AugqX/kcLChVPYWUNESyfID FfjXe1NliXYcpqmelqi3PfSg/uZNbwGBuZkwRAQh11yzGi68vo6JBnnzBc82IqPFF1L9cq x/Lxle5s43Es08iFctVZepjo+SOV7EXs/IktTeVy2ZGvgRe5nZam+LDAiBS0AsD1QF5ODB xNA7Uy/DF6RcliBUTIZA4HTFTAHakKec2PDVw8n91ByQEPpKJ/t/EB9spCIp/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765016576; a=rsa-sha256; cv=none; b=kYoaFb/iIX9C58ZFjgCPhc0rh6C0fOFMdOpVb3uclJsjqcTxambXD6fJ8H8HudoRCtJgQ/ A6/hNhck0QihGT9o5omqiNkY0WZrCFym3LsBR0egdRSYR+q9VHWMtlgMpK7YnA8nnA4wXh sd3cu/BdulVpvPQQ+/RCNCdzN7VZLcG2myewWk6gecYoCamYU++1rgZcSkoWs6f+8cJGIG Maqvcsu20bdb5TStP0CkRqhiOKEAmOE2r5dI/DdgeJ+Izjlp/2Ug4YzSz12DO2Tbcj98ZA f1hoA5n1t4NeCgfzzvK+s3g/l4NAKaWvBM7cb8jl7zCuMuTUc1zi+fryrcqPEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNkpS03wCzsC7 for ; Sat, 06 Dec 2025 10:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 389ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 10:22:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c95ea407b322 - main - ath11k: update Atheros/QCA's ath11k driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c95ea407b322379bcb3c013a2dca9a18072c1df8 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 10:22:55 +0000 Message-Id: <693403ff.389ef.72e27fb8@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c95ea407b322379bcb3c013a2dca9a18072c1df8 commit c95ea407b322379bcb3c013a2dca9a18072c1df8 Merge: fe7b6fc32455 989a88787ef2 Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 10:16:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-06 10:16:36 +0000 ath11k: update Atheros/QCA's ath11k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 ( tag: v6.18 ). Merge commit '989a88787ef2c1a73f44b82031a6f4f4470e2676' Sponsored by: The FreeBSD Foundation sys/contrib/dev/athk/ath11k/Kconfig | 3 +- sys/contrib/dev/athk/ath11k/Makefile | 5 +- sys/contrib/dev/athk/ath11k/ahb.c | 149 +- sys/contrib/dev/athk/ath11k/ce.c | 19 +- sys/contrib/dev/athk/ath11k/ce.h | 8 +- sys/contrib/dev/athk/ath11k/core.c | 817 +++++++-- sys/contrib/dev/athk/ath11k/core.h | 132 +- sys/contrib/dev/athk/ath11k/coredump.c | 54 + sys/contrib/dev/athk/ath11k/coredump.h | 79 + sys/contrib/dev/athk/ath11k/dbring.c | 4 +- sys/contrib/dev/athk/ath11k/dbring.h | 1 + sys/contrib/dev/athk/ath11k/debug.c | 3 + sys/contrib/dev/athk/ath11k/debug.h | 2 +- sys/contrib/dev/athk/ath11k/debugfs.c | 228 +-- sys/contrib/dev/athk/ath11k/debugfs.h | 21 +- sys/contrib/dev/athk/ath11k/debugfs_htt_stats.c | 17 +- sys/contrib/dev/athk/ath11k/debugfs_htt_stats.h | 2 +- sys/contrib/dev/athk/ath11k/debugfs_sta.c | 42 +- sys/contrib/dev/athk/ath11k/debugfs_sta.h | 1 + sys/contrib/dev/athk/ath11k/dp.c | 42 +- sys/contrib/dev/athk/ath11k/dp.h | 32 +- sys/contrib/dev/athk/ath11k/dp_rx.c | 335 ++-- sys/contrib/dev/athk/ath11k/dp_rx.h | 3 + sys/contrib/dev/athk/ath11k/dp_tx.c | 59 +- sys/contrib/dev/athk/ath11k/dp_tx.h | 3 +- sys/contrib/dev/athk/ath11k/fw.c | 171 ++ sys/contrib/dev/athk/ath11k/fw.h | 27 + sys/contrib/dev/athk/ath11k/hal.c | 99 +- sys/contrib/dev/athk/ath11k/hal.h | 14 +- sys/contrib/dev/athk/ath11k/hal_desc.h | 1 + sys/contrib/dev/athk/ath11k/hal_rx.c | 37 +- sys/contrib/dev/athk/ath11k/hal_rx.h | 19 +- sys/contrib/dev/athk/ath11k/hal_tx.c | 2 +- sys/contrib/dev/athk/ath11k/hal_tx.h | 4 +- sys/contrib/dev/athk/ath11k/hif.h | 68 +- sys/contrib/dev/athk/ath11k/htc.c | 3 +- sys/contrib/dev/athk/ath11k/htc.h | 18 +- sys/contrib/dev/athk/ath11k/hw.c | 4 +- sys/contrib/dev/athk/ath11k/hw.h | 6 +- sys/contrib/dev/athk/ath11k/mac.c | 2038 ++++++++++++++++------- sys/contrib/dev/athk/ath11k/mac.h | 6 + sys/contrib/dev/athk/ath11k/mhi.c | 129 +- sys/contrib/dev/athk/ath11k/mhi.h | 4 +- sys/contrib/dev/athk/ath11k/p2p.c | 149 ++ sys/contrib/dev/athk/ath11k/p2p.h | 22 + sys/contrib/dev/athk/ath11k/pci.c | 311 +++- sys/contrib/dev/athk/ath11k/pci.h | 4 +- sys/contrib/dev/athk/ath11k/pcic.c | 70 +- sys/contrib/dev/athk/ath11k/peer.c | 4 +- sys/contrib/dev/athk/ath11k/peer.h | 2 +- sys/contrib/dev/athk/ath11k/qmi.c | 142 +- sys/contrib/dev/athk/ath11k/qmi.h | 12 +- sys/contrib/dev/athk/ath11k/reg.c | 398 ++++- sys/contrib/dev/athk/ath11k/reg.h | 16 +- sys/contrib/dev/athk/ath11k/rx_desc.h | 1 + sys/contrib/dev/athk/ath11k/spectral.c | 32 +- sys/contrib/dev/athk/ath11k/spectral.h | 1 + sys/contrib/dev/athk/ath11k/testmode.c | 86 +- sys/contrib/dev/athk/ath11k/testmode_i.h | 66 - sys/contrib/dev/athk/ath11k/thermal.c | 28 +- sys/contrib/dev/athk/ath11k/thermal.h | 9 +- sys/contrib/dev/athk/ath11k/trace.c | 2 + sys/contrib/dev/athk/ath11k/trace.h | 45 +- sys/contrib/dev/athk/ath11k/wmi.c | 554 +++--- sys/contrib/dev/athk/ath11k/wmi.h | 299 ++-- sys/contrib/dev/athk/ath11k/wow.c | 45 +- sys/contrib/dev/athk/ath11k/wow.h | 1 + 67 files changed, 4897 insertions(+), 2113 deletions(-) diff --cc sys/contrib/dev/athk/ath11k/Makefile index cc47e0114595,000000000000..d9092414b362 mode 100644,000000..100644 --- a/sys/contrib/dev/athk/ath11k/Makefile +++ b/sys/contrib/dev/athk/ath11k/Makefile @@@ -1,36 -1,0 +1,39 @@@ +# SPDX-License-Identifier: BSD-3-Clause-Clear +obj-$(CONFIG_ATH11K) += ath11k.o +ath11k-y += core.o \ + hal.o \ + hal_tx.o \ + hal_rx.o \ + wmi.o \ + mac.o \ + reg.o \ + htc.o \ + qmi.o \ + dp.o \ + dp_tx.o \ + dp_rx.o \ + debug.o \ + ce.o \ + peer.o \ + dbring.o \ + hw.o \ - pcic.o ++ pcic.o \ ++ fw.o \ ++ p2p.o + +ath11k-$(CONFIG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o +ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o +ath11k-$(CONFIG_ATH11K_TRACING) += trace.o +ath11k-$(CONFIG_THERMAL) += thermal.o +ath11k-$(CONFIG_ATH11K_SPECTRAL) += spectral.o +ath11k-$(CONFIG_PM) += wow.o ++ath11k-$(CONFIG_DEV_COREDUMP) += coredump.o + +obj-$(CONFIG_ATH11K_AHB) += ath11k_ahb.o +ath11k_ahb-y += ahb.o + +obj-$(CONFIG_ATH11K_PCI) += ath11k_pci.o +ath11k_pci-y += mhi.o pci.o + +# for tracing framework to find trace.h +CFLAGS_trace.o := -I$(src) diff --cc sys/contrib/dev/athk/ath11k/ce.c index c6a20a635016,000000000000..1c1bf303ad77 mode 100644,000000..100644 --- a/sys/contrib/dev/athk/ath11k/ce.c +++ b/sys/contrib/dev/athk/ath11k/ce.c @@@ -1,1089 -1,0 +1,1088 @@@ +// SPDX-License-Identifier: BSD-3-Clause-Clear +/* + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021, Qualcomm Innovation Center, Inc. All rights reserved. ++ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. ++ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + ++#include +#include "dp_rx.h" +#include "debug.h" +#include "hif.h" + +const struct ce_attr ath11k_host_ce_config_ipq8074[] = { + /* CE0: host->target HTC control and raw streams */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 16, + .src_sz_max = 2048, + .dest_nentries = 0, + .send_cb = ath11k_htc_tx_completion_handler, + }, + + /* CE1: target->host HTT + HTC control */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath11k_htc_rx_completion_handler, + }, + + /* CE2: target->host WMI */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath11k_htc_rx_completion_handler, + }, + + /* CE3: host->target WMI (mac0) */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + .send_cb = ath11k_htc_tx_completion_handler, + }, + + /* CE4: host->target HTT */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 2048, + .src_sz_max = 256, + .dest_nentries = 0, + }, + + /* CE5: target->host pktlog */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath11k_dp_htt_htc_t2h_msg_handler, + }, + + /* CE6: target autonomous hif_memcpy */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE7: host->target WMI (mac1) */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + .send_cb = ath11k_htc_tx_completion_handler, + }, + + /* CE8: target autonomous hif_memcpy */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE9: host->target WMI (mac2) */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + .send_cb = ath11k_htc_tx_completion_handler, + }, + + /* CE10: target->host HTT */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath11k_htc_rx_completion_handler, + }, + + /* CE11: Not used */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, +}; + +const struct ce_attr ath11k_host_ce_config_qca6390[] = { + /* CE0: host->target HTC control and raw streams */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 16, + .src_sz_max = 2048, + .dest_nentries = 0, + }, + + /* CE1: target->host HTT + HTC control */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath11k_htc_rx_completion_handler, + }, + + /* CE2: target->host WMI */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath11k_htc_rx_completion_handler, + }, + + /* CE3: host->target WMI (mac0) */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + .send_cb = ath11k_htc_tx_completion_handler, + }, + + /* CE4: host->target HTT */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 2048, + .src_sz_max = 256, + .dest_nentries = 0, + }, + + /* CE5: target->host pktlog */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath11k_dp_htt_htc_t2h_msg_handler, + }, + + /* CE6: target autonomous hif_memcpy */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + + /* CE7: host->target WMI (mac1) */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + .send_cb = ath11k_htc_tx_completion_handler, + }, + + /* CE8: target autonomous hif_memcpy */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + +}; + +const struct ce_attr ath11k_host_ce_config_qcn9074[] = { + /* CE0: host->target HTC control and raw streams */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 16, + .src_sz_max = 2048, + .dest_nentries = 0, + }, + + /* CE1: target->host HTT + HTC control */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath11k_htc_rx_completion_handler, + }, + + /* CE2: target->host WMI */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 32, + .recv_cb = ath11k_htc_rx_completion_handler, + }, + + /* CE3: host->target WMI (mac0) */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + .send_cb = ath11k_htc_tx_completion_handler, + }, + + /* CE4: host->target HTT */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 2048, + .src_sz_max = 256, + .dest_nentries = 0, + }, + + /* CE5: target->host pktlog */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath11k_dp_htt_htc_t2h_msg_handler, + }, +}; + +static bool ath11k_ce_need_shadow_fix(int ce_id) +{ + /* only ce4 needs shadow workaround */ + if (ce_id == 4) + return true; + return false; +} + +void ath11k_ce_stop_shadow_timers(struct ath11k_base *ab) +{ + int i; + + if (!ab->hw_params.supports_shadow_regs) + return; + + for (i = 0; i < ab->hw_params.ce_count; i++) + if (ath11k_ce_need_shadow_fix(i)) + ath11k_dp_shadow_stop_timer(ab, &ab->ce.hp_timer[i]); +} + +static int ath11k_ce_rx_buf_enqueue_pipe(struct ath11k_ce_pipe *pipe, + struct sk_buff *skb, dma_addr_t paddr) +{ + struct ath11k_base *ab = pipe->ab; + struct ath11k_ce_ring *ring = pipe->dest_ring; + struct hal_srng *srng; + unsigned int write_index; + unsigned int nentries_mask = ring->nentries_mask; + u32 *desc; + int ret; + + lockdep_assert_held(&ab->ce.ce_lock); + + write_index = ring->write_index; + + srng = &ab->hal.srng_list[ring->hal_ring_id]; + + spin_lock_bh(&srng->lock); + + ath11k_hal_srng_access_begin(ab, srng); + + if (unlikely(ath11k_hal_srng_src_num_free(ab, srng, false) < 1)) { + ret = -ENOSPC; + goto exit; + } + + desc = ath11k_hal_srng_src_get_next_entry(ab, srng); + if (!desc) { + ret = -ENOSPC; + goto exit; + } + + ath11k_hal_ce_dst_set_desc(desc, paddr); + + ring->skb[write_index] = skb; + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + ring->write_index = write_index; + + pipe->rx_buf_needed--; + + ret = 0; +exit: + ath11k_hal_srng_access_end(ab, srng); + + spin_unlock_bh(&srng->lock); + + return ret; +} + +static int ath11k_ce_rx_post_pipe(struct ath11k_ce_pipe *pipe) +{ + struct ath11k_base *ab = pipe->ab; + struct sk_buff *skb; + dma_addr_t paddr; + int ret = 0; + + if (!(pipe->dest_ring || pipe->status_ring)) + return 0; + + spin_lock_bh(&ab->ce.ce_lock); + while (pipe->rx_buf_needed) { + skb = dev_alloc_skb(pipe->buf_sz); + if (!skb) { + ret = -ENOMEM; + goto exit; + } + + WARN_ON_ONCE(!IS_ALIGNED((unsigned long)skb->data, 4)); + + paddr = dma_map_single(ab->dev, skb->data, + skb->len + skb_tailroom(skb), + DMA_FROM_DEVICE); + if (unlikely(dma_mapping_error(ab->dev, paddr))) { + ath11k_warn(ab, "failed to dma map ce rx buf\n"); + dev_kfree_skb_any(skb); + ret = -EIO; + goto exit; + } + + ATH11K_SKB_RXCB(skb)->paddr = paddr; + + ret = ath11k_ce_rx_buf_enqueue_pipe(pipe, skb, paddr); + + if (ret) { - ath11k_warn(ab, "failed to enqueue rx buf: %d\n", ret); ++ ath11k_dbg(ab, ATH11K_DBG_CE, "failed to enqueue rx buf: %d\n", ++ ret); + dma_unmap_single(ab->dev, paddr, + skb->len + skb_tailroom(skb), + DMA_FROM_DEVICE); + dev_kfree_skb_any(skb); + goto exit; + } + } + +exit: + spin_unlock_bh(&ab->ce.ce_lock); + return ret; +} + +static int ath11k_ce_completed_recv_next(struct ath11k_ce_pipe *pipe, + struct sk_buff **skb, int *nbytes) +{ + struct ath11k_base *ab = pipe->ab; + struct hal_srng *srng; + unsigned int sw_index; + unsigned int nentries_mask; + u32 *desc; + int ret = 0; + + spin_lock_bh(&ab->ce.ce_lock); + + sw_index = pipe->dest_ring->sw_index; + nentries_mask = pipe->dest_ring->nentries_mask; + + srng = &ab->hal.srng_list[pipe->status_ring->hal_ring_id]; + + spin_lock_bh(&srng->lock); + + ath11k_hal_srng_access_begin(ab, srng); + + desc = ath11k_hal_srng_dst_get_next_entry(ab, srng); + if (!desc) { + ret = -EIO; + goto err; + } + + *nbytes = ath11k_hal_ce_dst_status_get_length(desc); - if (*nbytes == 0) { - ret = -EIO; - goto err; - } + + *skb = pipe->dest_ring->skb[sw_index]; + pipe->dest_ring->skb[sw_index] = NULL; + + sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); + pipe->dest_ring->sw_index = sw_index; + + pipe->rx_buf_needed++; +err: + ath11k_hal_srng_access_end(ab, srng); + + spin_unlock_bh(&srng->lock); + + spin_unlock_bh(&ab->ce.ce_lock); + + return ret; +} + +static void ath11k_ce_recv_process_cb(struct ath11k_ce_pipe *pipe) +{ + struct ath11k_base *ab = pipe->ab; + struct sk_buff *skb; + struct sk_buff_head list; + unsigned int nbytes, max_nbytes; + int ret; + + __skb_queue_head_init(&list); + while (ath11k_ce_completed_recv_next(pipe, &skb, &nbytes) == 0) { + max_nbytes = skb->len + skb_tailroom(skb); + dma_unmap_single(ab->dev, ATH11K_SKB_RXCB(skb)->paddr, + max_nbytes, DMA_FROM_DEVICE); + - if (unlikely(max_nbytes < nbytes)) { - ath11k_warn(ab, "rxed more than expected (nbytes %d, max %d)", ++ if (unlikely(max_nbytes < nbytes || nbytes == 0)) { ++ ath11k_warn(ab, "unexpected rx length (nbytes %d, max %d)", + nbytes, max_nbytes); + dev_kfree_skb_any(skb); + continue; + } + + skb_put(skb, nbytes); + __skb_queue_tail(&list, skb); + } + + while ((skb = __skb_dequeue(&list))) { + ath11k_dbg(ab, ATH11K_DBG_CE, "rx ce pipe %d len %d\n", + pipe->pipe_num, skb->len); + pipe->recv_cb(ab, skb); + } + + ret = ath11k_ce_rx_post_pipe(pipe); + if (ret && ret != -ENOSPC) { + ath11k_warn(ab, "failed to post rx buf to pipe: %d err: %d\n", + pipe->pipe_num, ret); + mod_timer(&ab->rx_replenish_retry, + jiffies + ATH11K_CE_RX_POST_RETRY_JIFFIES); + } +} + +static struct sk_buff *ath11k_ce_completed_send_next(struct ath11k_ce_pipe *pipe) +{ + struct ath11k_base *ab = pipe->ab; + struct hal_srng *srng; + unsigned int sw_index; + unsigned int nentries_mask; + struct sk_buff *skb; + u32 *desc; + + spin_lock_bh(&ab->ce.ce_lock); + + sw_index = pipe->src_ring->sw_index; + nentries_mask = pipe->src_ring->nentries_mask; + + srng = &ab->hal.srng_list[pipe->src_ring->hal_ring_id]; + + spin_lock_bh(&srng->lock); + + ath11k_hal_srng_access_begin(ab, srng); + + desc = ath11k_hal_srng_src_reap_next(ab, srng); + if (!desc) { + skb = ERR_PTR(-EIO); + goto err_unlock; + } + + skb = pipe->src_ring->skb[sw_index]; + + pipe->src_ring->skb[sw_index] = NULL; + + sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); + pipe->src_ring->sw_index = sw_index; + +err_unlock: + spin_unlock_bh(&srng->lock); + + spin_unlock_bh(&ab->ce.ce_lock); + + return skb; +} + +static void ath11k_ce_tx_process_cb(struct ath11k_ce_pipe *pipe) +{ + struct ath11k_base *ab = pipe->ab; + struct sk_buff *skb; + struct sk_buff_head list; + + __skb_queue_head_init(&list); + while (!IS_ERR(skb = ath11k_ce_completed_send_next(pipe))) { + if (!skb) + continue; + + dma_unmap_single(ab->dev, ATH11K_SKB_CB(skb)->paddr, skb->len, + DMA_TO_DEVICE); + + if ((!pipe->send_cb) || ab->hw_params.credit_flow) { + dev_kfree_skb_any(skb); + continue; + } + + __skb_queue_tail(&list, skb); + } + + while ((skb = __skb_dequeue(&list))) { + ath11k_dbg(ab, ATH11K_DBG_CE, "tx ce pipe %d len %d\n", + pipe->pipe_num, skb->len); + pipe->send_cb(ab, skb); + } +} + +static void ath11k_ce_srng_msi_ring_params_setup(struct ath11k_base *ab, u32 ce_id, + struct hal_srng_params *ring_params) +{ + u32 msi_data_start; + u32 msi_data_count, msi_data_idx; + u32 msi_irq_start; + u32 addr_lo; + u32 addr_hi; + int ret; + + ret = ath11k_get_user_msi_vector(ab, "CE", + &msi_data_count, &msi_data_start, + &msi_irq_start); + + if (ret) + return; + + ath11k_get_msi_address(ab, &addr_lo, &addr_hi); + ath11k_get_ce_msi_idx(ab, ce_id, &msi_data_idx); + + ring_params->msi_addr = addr_lo; + ring_params->msi_addr |= (dma_addr_t)(((uint64_t)addr_hi) << 32); + ring_params->msi_data = (msi_data_idx % msi_data_count) + msi_data_start; + ring_params->flags |= HAL_SRNG_FLAGS_MSI_INTR; +} + +static int ath11k_ce_init_ring(struct ath11k_base *ab, + struct ath11k_ce_ring *ce_ring, + int ce_id, enum hal_ring_type type) +{ - struct hal_srng_params params = { 0 }; ++ struct hal_srng_params params = {}; + int ret; + + params.ring_base_paddr = ce_ring->base_addr_ce_space; + params.ring_base_vaddr = ce_ring->base_addr_owner_space; + params.num_entries = ce_ring->nentries; + + if (!(CE_ATTR_DIS_INTR & ab->hw_params.host_ce_config[ce_id].flags)) + ath11k_ce_srng_msi_ring_params_setup(ab, ce_id, ¶ms); + + switch (type) { + case HAL_CE_SRC: + if (!(CE_ATTR_DIS_INTR & ab->hw_params.host_ce_config[ce_id].flags)) + params.intr_batch_cntr_thres_entries = 1; + break; + case HAL_CE_DST: + params.max_buffer_len = ab->hw_params.host_ce_config[ce_id].src_sz_max; + if (!(ab->hw_params.host_ce_config[ce_id].flags & CE_ATTR_DIS_INTR)) { + params.intr_timer_thres_us = 1024; + params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN; + params.low_threshold = ce_ring->nentries - 3; + } + break; + case HAL_CE_DST_STATUS: + if (!(ab->hw_params.host_ce_config[ce_id].flags & CE_ATTR_DIS_INTR)) { + params.intr_batch_cntr_thres_entries = 1; + params.intr_timer_thres_us = 0x1000; + } + break; + default: + ath11k_warn(ab, "Invalid CE ring type %d\n", type); + return -EINVAL; + } + + /* TODO: Init other params needed by HAL to init the ring */ + + ret = ath11k_hal_srng_setup(ab, type, ce_id, 0, ¶ms); + if (ret < 0) { + ath11k_warn(ab, "failed to setup srng: %d ring_id %d\n", + ret, ce_id); + return ret; + } + + ce_ring->hal_ring_id = ret; + + if (ab->hw_params.supports_shadow_regs && + ath11k_ce_need_shadow_fix(ce_id)) + ath11k_dp_shadow_init_timer(ab, &ab->ce.hp_timer[ce_id], + ATH11K_SHADOW_CTRL_TIMER_INTERVAL, + ce_ring->hal_ring_id); + + return 0; +} + +static struct ath11k_ce_ring * +ath11k_ce_alloc_ring(struct ath11k_base *ab, int nentries, int desc_sz) +{ + struct ath11k_ce_ring *ce_ring; + dma_addr_t base_addr; + + ce_ring = kzalloc(struct_size(ce_ring, skb, nentries), GFP_KERNEL); + if (ce_ring == NULL) + return ERR_PTR(-ENOMEM); + + ce_ring->nentries = nentries; + ce_ring->nentries_mask = nentries - 1; + + /* Legacy platforms that do not support cache + * coherent DMA are unsupported + */ + ce_ring->base_addr_owner_space_unaligned = + dma_alloc_coherent(ab->dev, + nentries * desc_sz + CE_DESC_RING_ALIGN, + &base_addr, GFP_KERNEL); + if (!ce_ring->base_addr_owner_space_unaligned) { + kfree(ce_ring); + return ERR_PTR(-ENOMEM); + } + + ce_ring->base_addr_ce_space_unaligned = base_addr; + + ce_ring->base_addr_owner_space = PTR_ALIGN( + ce_ring->base_addr_owner_space_unaligned, + CE_DESC_RING_ALIGN); + ce_ring->base_addr_ce_space = ALIGN( + ce_ring->base_addr_ce_space_unaligned, + CE_DESC_RING_ALIGN); + + return ce_ring; +} + +static int ath11k_ce_alloc_pipe(struct ath11k_base *ab, int ce_id) +{ + struct ath11k_ce_pipe *pipe = &ab->ce.ce_pipe[ce_id]; + const struct ce_attr *attr = &ab->hw_params.host_ce_config[ce_id]; + struct ath11k_ce_ring *ring; + int nentries; + int desc_sz; + + pipe->attr_flags = attr->flags; + + if (attr->src_nentries) { + pipe->send_cb = attr->send_cb; + nentries = roundup_pow_of_two(attr->src_nentries); + desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_SRC); + ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz); + if (IS_ERR(ring)) + return PTR_ERR(ring); + pipe->src_ring = ring; + } + + if (attr->dest_nentries) { + pipe->recv_cb = attr->recv_cb; + nentries = roundup_pow_of_two(attr->dest_nentries); + desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_DST); + ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz); + if (IS_ERR(ring)) + return PTR_ERR(ring); + pipe->dest_ring = ring; + + desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_DST_STATUS); + ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz); + if (IS_ERR(ring)) + return PTR_ERR(ring); + pipe->status_ring = ring; + } + + return 0; +} + +void ath11k_ce_per_engine_service(struct ath11k_base *ab, u16 ce_id) +{ + struct ath11k_ce_pipe *pipe = &ab->ce.ce_pipe[ce_id]; + const struct ce_attr *attr = &ab->hw_params.host_ce_config[ce_id]; + + if (attr->src_nentries) + ath11k_ce_tx_process_cb(pipe); + + if (pipe->recv_cb) + ath11k_ce_recv_process_cb(pipe); +} + +void ath11k_ce_poll_send_completed(struct ath11k_base *ab, u8 pipe_id) +{ + struct ath11k_ce_pipe *pipe = &ab->ce.ce_pipe[pipe_id]; + const struct ce_attr *attr = &ab->hw_params.host_ce_config[pipe_id]; + + if ((pipe->attr_flags & CE_ATTR_DIS_INTR) && attr->src_nentries) + ath11k_ce_tx_process_cb(pipe); +} +EXPORT_SYMBOL(ath11k_ce_per_engine_service); + +int ath11k_ce_send(struct ath11k_base *ab, struct sk_buff *skb, u8 pipe_id, + u16 transfer_id) +{ + struct ath11k_ce_pipe *pipe = &ab->ce.ce_pipe[pipe_id]; + struct hal_srng *srng; + u32 *desc; + unsigned int write_index, sw_index; + unsigned int nentries_mask; + int ret = 0; + u8 byte_swap_data = 0; + int num_used; + + /* Check if some entries could be regained by handling tx completion if + * the CE has interrupts disabled and the used entries is more than the + * defined usage threshold. + */ + if (pipe->attr_flags & CE_ATTR_DIS_INTR) { + spin_lock_bh(&ab->ce.ce_lock); + write_index = pipe->src_ring->write_index; + + sw_index = pipe->src_ring->sw_index; + + if (write_index >= sw_index) + num_used = write_index - sw_index; + else + num_used = pipe->src_ring->nentries - sw_index + + write_index; + + spin_unlock_bh(&ab->ce.ce_lock); + + if (num_used > ATH11K_CE_USAGE_THRESHOLD) + ath11k_ce_poll_send_completed(ab, pipe->pipe_num); + } + + if (test_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags)) + return -ESHUTDOWN; + + spin_lock_bh(&ab->ce.ce_lock); + + write_index = pipe->src_ring->write_index; + nentries_mask = pipe->src_ring->nentries_mask; + + srng = &ab->hal.srng_list[pipe->src_ring->hal_ring_id]; + + spin_lock_bh(&srng->lock); + + ath11k_hal_srng_access_begin(ab, srng); + + if (unlikely(ath11k_hal_srng_src_num_free(ab, srng, false) < 1)) { + ath11k_hal_srng_access_end(ab, srng); + ret = -ENOBUFS; + goto err_unlock; + } + + desc = ath11k_hal_srng_src_get_next_reaped(ab, srng); + if (!desc) { + ath11k_hal_srng_access_end(ab, srng); + ret = -ENOBUFS; + goto err_unlock; + } + + if (pipe->attr_flags & CE_ATTR_BYTE_SWAP_DATA) + byte_swap_data = 1; + + ath11k_hal_ce_src_set_desc(desc, ATH11K_SKB_CB(skb)->paddr, + skb->len, transfer_id, byte_swap_data); + + pipe->src_ring->skb[write_index] = skb; + pipe->src_ring->write_index = CE_RING_IDX_INCR(nentries_mask, + write_index); + + ath11k_hal_srng_access_end(ab, srng); + + if (ath11k_ce_need_shadow_fix(pipe_id)) + ath11k_dp_shadow_start_timer(ab, srng, &ab->ce.hp_timer[pipe_id]); + + spin_unlock_bh(&srng->lock); + + spin_unlock_bh(&ab->ce.ce_lock); + + return 0; + +err_unlock: + spin_unlock_bh(&srng->lock); + + spin_unlock_bh(&ab->ce.ce_lock); + + return ret; +} + +static void ath11k_ce_rx_pipe_cleanup(struct ath11k_ce_pipe *pipe) +{ + struct ath11k_base *ab = pipe->ab; + struct ath11k_ce_ring *ring = pipe->dest_ring; + struct sk_buff *skb; + int i; + + if (!(ring && pipe->buf_sz)) + return; + + for (i = 0; i < ring->nentries; i++) { + skb = ring->skb[i]; + if (!skb) + continue; + + ring->skb[i] = NULL; + dma_unmap_single(ab->dev, ATH11K_SKB_RXCB(skb)->paddr, + skb->len + skb_tailroom(skb), DMA_FROM_DEVICE); + dev_kfree_skb_any(skb); + } +} + +static void ath11k_ce_shadow_config(struct ath11k_base *ab) +{ + int i; + + for (i = 0; i < ab->hw_params.ce_count; i++) { + if (ab->hw_params.host_ce_config[i].src_nentries) + ath11k_hal_srng_update_shadow_config(ab, + HAL_CE_SRC, i); + + if (ab->hw_params.host_ce_config[i].dest_nentries) { + ath11k_hal_srng_update_shadow_config(ab, + HAL_CE_DST, i); + + ath11k_hal_srng_update_shadow_config(ab, + HAL_CE_DST_STATUS, i); *** 41511 LINES SKIPPED *** From nobody Sat Dec 6 10:22:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNkpT3x5fz6KThw for ; Sat, 06 Dec 2025 10:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNkpT10glz3KD1 for ; Sat, 06 Dec 2025 10:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765016577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6cDB+zFHsayxboOYLUhq1E4nbLZ8lZ/9ErV8YiIko7I=; b=Lp9z258sA6IJjwAnNxocs64UrW9Bx6MDo0wOsVq6oLjUFqjq+Z2tTc+zUAhGZg5zySSVRV XclLbrfXPyVTV153BPdG4oDxQaUSHXHxcRcn8yTxFYYl+94GosAX7OGHrybOPHfLnn+eE6 nBOa3b0wcIa046dwEI2FlI7R1X+qZ9c3svje0RyexQoFiOxRwRiM2E3IbTKW6+mlOhbBmt yBUNgp4Xfif/KBMD6f9lOxIGjM7HbZpLKtlLQa/hbrlx5I96F6YXe/2rEOrM1pStZp90f1 CVfoNkwvpkKD/oXLCHps/AtAY99DKuj/KzkZOO2XRhXdikd6KDfFZ9+hOrlBEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765016577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6cDB+zFHsayxboOYLUhq1E4nbLZ8lZ/9ErV8YiIko7I=; b=RMOITIpSGn7GL7kzltmkL8aBM8Cu7MK1ObILNw0qXYnNnACQGcj7DZMBZPH/HYQkDypvny 8DT14MgDqpPlytUXZZIhfdXHZAUCmAnXflbiI1Ra3/zltb6wGq38HZDMwd9oV1pPgjL4gQ 7IffsIWa2v6n96VOfbTPakwF0Mt7s3aEFO4ZtzWIekgk0GA1YeT9R/+Q/9YdCSj5dccGYe 5p0BHs/OhC4Cx0Q0Y8mnCzImjk8cs/BkCu6rJCyvM4O3sGh1V3wiuzIv+b+i9L9sRvyr0y DuRH53WNijBYSQbOzh2uLsM2fjrkLFtKMYVFhrWmmpP5GbxWwGKDUzpzQgm8Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765016577; a=rsa-sha256; cv=none; b=R2l0WHwHciXF/Ns9x8LbEKUaER89kpYPHMh1mflPV2XFTtdwF+epjF8ndqAxr2EB5VXZPT 2zvAO1zMi3jWQijdvxyGloq9+btKy7YYZ/nPqrl01pd204jHRPTzHJ2rUqgB6Ns2kVEeJi CGVMnxP6LgBB8eyzdKqJZEEyZHiVhGzY7ONhPkf4VeYGYe7RIvgCd0JgVJgEWhSWgI2zXs TRLupDf/OwjL9Nyg5DiVbqcxglCSdzl6KUO4J3x0L45MKcIil94PQ3JsQSzVfJ1KrvHwhc 4oIlKHb4Eus/KkL3dSszGdyidgbmCz/PeBp5+s4jthbN8ngYRZuC8amZ6a6fqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNkpT0NKGzrwh for ; Sat, 06 Dec 2025 10:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a54f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 10:22:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9c2f32163089 - main - ath11k: start making compile some more List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c2f321630894b40c1ec51ece881c7c765d6d749 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 10:22:57 +0000 Message-Id: <69340401.3a54f.2fd785a5@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9c2f321630894b40c1ec51ece881c7c765d6d749 commit 9c2f321630894b40c1ec51ece881c7c765d6d749 Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 10:21:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-06 10:21:31 +0000 ath11k: start making compile some more There is more work to do to make this compile again but we will do that when we get to the driver. For now just take the most noise out of it. --- sys/contrib/dev/athk/ath11k/core.h | 2 ++ sys/contrib/dev/athk/ath11k/coredump.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/sys/contrib/dev/athk/ath11k/core.h b/sys/contrib/dev/athk/ath11k/core.h index 03eaacf3cb5f..9825bce61b1e 100644 --- a/sys/contrib/dev/athk/ath11k/core.h +++ b/sys/contrib/dev/athk/ath11k/core.h @@ -1350,7 +1350,9 @@ static inline void ath11k_core_create_firmware_path(struct ath11k_base *ab, { const char *fw_name = NULL; +#if defined(CONFIG_OF) of_property_read_string(ab->dev->of_node, "firmware-name", &fw_name); +#endif if (fw_name && strncmp(filename, "board", 5)) snprintf(buf, buf_len, "%s/%s/%s/%s", ATH11K_FW_DIR, diff --git a/sys/contrib/dev/athk/ath11k/coredump.h b/sys/contrib/dev/athk/ath11k/coredump.h index 3960d9385261..871388dc42b0 100644 --- a/sys/contrib/dev/athk/ath11k/coredump.h +++ b/sys/contrib/dev/athk/ath11k/coredump.h @@ -6,6 +6,10 @@ #ifndef _ATH11K_COREDUMP_H_ #define _ATH11K_COREDUMP_H_ +#if defined(__FreeBSD__) +#include +#endif + #define ATH11K_FW_CRASH_DUMP_V2 2 enum ath11k_fw_crash_dump_type { From nobody Sat Dec 6 10:25:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNks16rL9z6KTRT for ; Sat, 06 Dec 2025 10:25: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNks14t77z3KnB for ; Sat, 06 Dec 2025 10:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765016709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mx5zpBbCcxT/lDSDAp1O6qDiNCH4CkPOK1rA/6sSokM=; b=TBoPQqTN9Zy6v9ao5Slt/lMxASRlbgLbd62sZlyF0s7WmPX4epbTM1a+RUzY0U1+EqSlyD Tedh8mxaSC5umQ0yTTUhmW77/X6MPc4d/1JoKgx68A5VHP5XwmzIL3a4m2G73W12f4oPgO WynaQ95XVjBiLOuOVcczGpcKAcxbXQMtmWXrkeKceMu/1qltKlDixCXDHKsUi1oqBKfuYC QsNhsTHLIdFYn45bYnJ44jj6N8N7AoeL3b9cIf6Gsiu4qQ6Di7ZnWCu3rBrS3mL36/yV3O Gd16TrWA0Zfc8YxMrusgrZqf3I0pisklAm9SIAs0v4ta5BJxpRqIQs1wOaLNew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765016709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mx5zpBbCcxT/lDSDAp1O6qDiNCH4CkPOK1rA/6sSokM=; b=aDBEn17WGFV2qmJxBoZXWDMoB/seYJh/JwnVPV00vSvEADwdSjYMCz2mCk1AXwd9orQejm jlskSRX0H7rXHAAvDuXHYakmi/OSIoOl/Yj94eT8dCE1ajKV34aTI0uzbCV9dopFN84vEH 08o/iZ1X0iln+GJdgILdMYeTc+CarT+rXRkiVHwMvyWjKHrdeSjJNfWF3xrPBfmQjniciQ G/B4jc1NngXJ1ynCBhzpIDOI09oi0dk9ucxeJRN57PNRNuXfAw4q7QuoAe/AfkJe/v2WCl Xxo9aoAs3Q/Lv4rRGW2zNqWy0LwWtC/LI1tZ8aMT/hmFg/foIJeoLbxx5GmLUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765016709; a=rsa-sha256; cv=none; b=JK5YJqmBN8ZE7XKlbWRJInwoUupXyughsamodRaoeyoUN6x2a6EFeQxTow7siBpEuWtLn/ BxU1ej0l0q2ayh+9dJ2SqG3euBWgKCB6UelbOqO0BlYfKi/rrFLtV/hnA6WKyOYoFh7fB9 qLPNBP1J7uJikV0fzHBgYjO48H7KNXteePpExhdIR4AmISmfLwkJ5BjoBdneaoJOtdVvhi GhqA5vqRA1E0fmdlJ9q8x+NCrJj4XitTTtMAw6oFGwqD+S1OwXnbJ52GOjzcu4twapGSw5 B7wSAZDCut7zV3cK9b/0L21NYQpx2ZXDpyiIjCqiFo7bQ6Gypj6ikKILemxmbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNks14RXkzsJB for ; Sat, 06 Dec 2025 10:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39b29 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 10:25:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c68126ec2594 - main - ath11k: add new files to module Makefile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c68126ec2594a80ac095e5ce9e6138709db75519 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 10:25:09 +0000 Message-Id: <69340485.39b29.59f38284@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c68126ec2594a80ac095e5ce9e6138709db75519 commit c68126ec2594a80ac095e5ce9e6138709db75519 Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 10:24:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-06 10:24:29 +0000 ath11k: add new files to module Makefile Add the new files to the module Makefile as well, so they do not get lost. --- sys/modules/ath11k/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile index fb610117dfa5..42aa9b9936cd 100644 --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -11,6 +11,7 @@ SRCS+= core.c hal.c hal_tx.c hal_rx.c SRCS+= wmi.c mac.c reg.c htc.c qmi.c SRCS+= dp.c dp_tx.c dp_rx.c debug.c SRCS+= ce.c peer.c dbring.c hw.c +SRCS+= coredump.c fw.c p2p.c SRCS+= mhi.c pci.c pcic.c From nobody Sat Dec 6 12:21:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNnQz3WS2z6KccC for ; Sat, 06 Dec 2025 12:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNnQy6mzFz3Xjl for ; Sat, 06 Dec 2025 12:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJiX9FMdiYgApXvJ6pSdFbjKw5wJgMvxc13876JM5HY=; b=R8UramVgKWiM3bNTAP3839f11x/4XJ3+5c23LXVRz1NhhB+/JgYMszrcY8Gt1yCNJt1xA/ pF8GbQ5Xnbh2nUUQcBIDtNvEZpGxfRIvVCLqsH/Zk+E8qZoF8sx6xqbXokme1w6rloiZpZ g8MJbeQrzm6PsloZsppFzqHIeWeyTuaEmsY9BPSqPgvTECFneEXLGyjpkt/m9IJwX72kBj HqHr8aMKfctYSx1zA670zcUT5dOq3IKbyB6HNzw6dFHDwhXYq2k46TBct5vC40TwGWA16W eazrj/32/C2Qa0aj7fwOCbe0C2g9FOPtBcJKxoJx+w66hu6PPeRFoVN4Leo4sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJiX9FMdiYgApXvJ6pSdFbjKw5wJgMvxc13876JM5HY=; b=TEOMT/hYTyF9Nl0KfQ/uFHxJUTUB5JNVjYPs2NFMYL+yOtTgaOEX+wpGkBDVWBve1Niub1 qnkXrzax3k5nINcWzQYkNx25XOug2hltSDLV4RkjMpOiFfQvXB1q/KAE1jxHYExHwr5/G6 Z8fgsNz2LeBT1TLYxpCsKr3uvctmKWwRcoFe+86wGUX3BN3EmNoJWesCtn8OoR5zqj5iHr bh3sVSCf8yCoTueKPuH30aw9gqJDTGYjxCZGEKTmGcT0SMO1zHROpivrTiuoC7ogQtYTTE cRPl6VZ3Gvhd0BsSKlYYqJbxUfExqC5v1yCrLIlYvuon7h1+YSm+xjjKQRSqYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765023675; a=rsa-sha256; cv=none; b=fAolbdLkEFSMGCnfzOclFzKfz8eS0sDGx8RDHD0XGPUt0zHL6arVH5dJWC6aOpc/vod81M Z7h13jqpArcTy+EYWgpPq3mT7XQG8/OANsMUmSHkgXIBo86TogQCJrkp14RSmcZEI6lgBN rH6tRGwtP62fd5mv9Bqd9t8ce3gDePH2e5M+1UzDCeXetFNG1MmdtlfVY2/IM+iBexX/25 6dsYYfdvenzD+hvzUlqvISpYVlS6laPJO/5gLqNVUXE05Yx+OaydUyEGeiazaNLSHPUvAw /PUcjfVVHPtnPvSRn/qbAiBk+mcST8lD/vZPM52HoTXDzh/gu7vilfGHF1N6iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNnQy5WqMzwW4 for ; Sat, 06 Dec 2025 12:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b468 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 12:21:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 09701dc19cf0 - main - cldr2def.pl: Cleanup white space List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09701dc19cf0d6f1a41abcae89c00122546498fb Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 12:21:14 +0000 Message-Id: <69341fba.b468.769a32bc@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=09701dc19cf0d6f1a41abcae89c00122546498fb commit 09701dc19cf0d6f1a41abcae89c00122546498fb Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:15 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-06 12:20:15 +0000 cldr2def.pl: Cleanup white space No functional change intended. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53914 --- tools/tools/locale/tools/cldr2def.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index e59e6d3b13a1..ea49c21300c4 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -383,9 +383,9 @@ sub resolve_enc_addition { sub get_languages { my %data = get_xmldata($ETCDIR); - %languages = %{$data{L}}; - %translations = %{$data{T}}; - %alternativemonths = %{$data{AM}}; + %languages = %{$data{L}}; + %translations = %{$data{T}}; + %alternativemonths = %{$data{AM}}; } sub transform_ctypes { @@ -826,7 +826,7 @@ EOF # $rv = translate($enc, $cm) # if (!defined $rv); if (!defined $rv) { - print STDERR + print STDERR "Could not convert $k ($cm) from $DEFENCODING to $enc\n"; $okay = 0; next; @@ -854,7 +854,7 @@ EOF # $cm) # if (!defined $rv); if (!defined $rv) { - print STDERR + print STDERR "Could not convert $k ($cm) from $DEFENCODING to $enc\n"; $okay = 0; next; From nobody Sat Dec 6 12:21:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR05qsGz6KcqT for ; Sat, 06 Dec 2025 12:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNnR00Qvjz3XgK for ; Sat, 06 Dec 2025 12:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KbM5QN4ndYCxX7RTAqVLm05pCVIBfJ53SaQl2xZYeSM=; b=epYGnih5vHcKyD9ROWeuxuAAYuOp16/xw9QgJCqYTGjJNgVOhBfByVDf/ldTlS/3oNQ+O6 XZR0mNZ/YUqe+PBwrQledHt4dk28Xmy6312wIdHyVb3JoLvMfpZlrNYEfLMIzgstxoj4O8 uOy2m6ZZx4PlEqcUcmyK7JaWPjwvrQcoX3QOmiVgRTdYiIS3ZafKnyviFYV35E1HpqwHr8 QpSJyV/yeox2HnOYVkAQfqWJbSIhH8ZHdE4mKkV89cWZ/PCUvT8uZghXIGPlZUcvvAy59O V0/cF0yrrvr7BsdjXDBq7pwvXyLB3BQoilvIK2HieDf5CSCs08TvCvk/AT9Crw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KbM5QN4ndYCxX7RTAqVLm05pCVIBfJ53SaQl2xZYeSM=; b=fUYijqipC4PFxNMp2dVFBVDO5Q4BzOKfiYWJkZ0IMhQr3k0rhemS9PwF2jtiLMVZhuc8iO vMXrkSbxt1LgohT+RJl4j7HKUQlLYqu0EEErX1p/04TujvfDOjN4Ye4TU8x+KG+j11VLaq euqNC+L7xfhg00r5dPDUjJDAw+DqnF15k2eTd0r0O8n3wdav4Q5UCasBqxxsn1eCqvabAW 4Oyc8HnLp7OKde9iEfDMfEkSmkcgit2x2uYaiXSa0MzYaLsGGpfnPth4mOSTaZ/NbA3ZTv jrmlDru4fUoYVrrru0andbWrAJUFVLLSCAC9aGtGJA8BcOydxIeosFvht5vxBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765023676; a=rsa-sha256; cv=none; b=K8CMDZ6vellAY09IiynvJ4TDb7C6X5KjUXWogHRmZnTK4Hjyqmscijbqcb1qKCR7ttdDDR GYm+a7rwvLX6pnqM5zC/HYCVvqaWWHgET7SI8k7jyd/vxbh9+L+SKHMBM5vbIzhZaHHqaA mV+1T9Ir1v0BjnrvR/dSojCp9+DT3ZmmX+6fw6MSxcRzoxJuZE4CQXrP2Wx4ePPgboQVNo uOpaxrrYVZxxW+87kms+r72ArCyhzNGPDwyS+cHpvoGPdEHLR9iLY07jC/lu3EvNY2lQNC Cp31RbqwQGDKSquLThhlV+6d8LZJ0ggWcegUh90QgaFvyTGVDw86RRipJE/54g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNnQz6cQ3zwGd for ; Sat, 06 Dec 2025 12:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e082 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 12:21:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: faf33e05013f - main - cldr2def.pl: Add international currency parameters List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faf33e05013fb3fc79cc035c1ff7b52f3fa1af1b Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 12:21:15 +0000 Message-Id: <69341fbb.e082.1d8cc055@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=faf33e05013fb3fc79cc035c1ff7b52f3fa1af1b commit faf33e05013fb3fc79cc035c1ff7b52f3fa1af1b Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:16 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-06 12:20:16 +0000 cldr2def.pl: Add international currency parameters Add the missing international monetary parameters present in the lconv struct. See also https://unicode-org.atlassian.net/browse/CLDR-237. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53915 --- tools/tools/locale/tools/cldr2def.pl | 42 +++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index ea49c21300c4..998e176de918 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -121,6 +121,12 @@ my %DESC = ( "n_sep_by_space" => "n_sep_by_space", "p_sign_posn" => "p_sign_posn", "n_sign_posn" => "n_sign_posn", + "int_p_cs_precedes" => "int_p_cs_precedes", + "int_n_cs_precedes" => "int_n_cs_precedes", + "int_p_sep_by_space" => "int_p_sep_by_space", + "int_n_sep_by_space" => "int_n_sep_by_space", + "int_p_sign_posn" => "int_p_sign_posn", + "int_n_sign_posn" => "int_n_sign_posn", # msgdef "yesexpr" => "yesexpr", @@ -166,21 +172,27 @@ if ($TYPE eq "numericdef") { if ($TYPE eq "monetdef") { %keys = ( - "int_curr_symbol" => "s", - "currency_symbol" => "s", - "mon_decimal_point" => "s", - "mon_thousands_sep" => "s", - "mon_grouping" => "ai", - "positive_sign" => "s", - "negative_sign" => "s", - "int_frac_digits" => "i", - "frac_digits" => "i", - "p_cs_precedes" => "i", - "p_sep_by_space" => "i", - "n_cs_precedes" => "i", - "n_sep_by_space" => "i", - "p_sign_posn" => "i", - "n_sign_posn" => "i" + "int_curr_symbol" => "s", + "currency_symbol" => "s", + "mon_decimal_point" => "s", + "mon_thousands_sep" => "s", + "mon_grouping" => "ai", + "positive_sign" => "s", + "negative_sign" => "s", + "int_frac_digits" => "i", + "frac_digits" => "i", + "p_cs_precedes" => "i", + "p_sep_by_space" => "i", + "n_cs_precedes" => "i", + "n_sep_by_space" => "i", + "p_sign_posn" => "i", + "n_sign_posn" => "i", + "int_p_cs_precedes" => "i", + "int_n_cs_precedes" => "i", + "int_p_sep_by_space" => "i", + "int_n_sep_by_space" => "i", + "int_p_sign_posn" => "i", + "int_n_sign_posn" => "i" ); get_fields(); print_fields(); From nobody Sat Dec 6 12:21:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR16sZqz6KccH for ; Sat, 06 Dec 2025 12:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNnR132qWz3Xds for ; Sat, 06 Dec 2025 12:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rt4xuoBtr2ZHxxTVeUMYHvZ/LXzN685VKCcB+FvRKBE=; b=YudPPoOVXEu/jqKNsiWXQVbDfAk7y2HgWbCfkOih3L5WO7eMlsHaNInqS0FX9mPRT8/wJM ACLUffwJQEBAkGK6RPbpTxWlBK9TXrmZ3lmvMBZBhf86pVZk32npiSZW1HruaJM5tbPwGJ to38dCb8YY0b4zpOR80WGhTDbVCg5joJvhNLCG3GFBo/+BnrzLmqx7y7QmEAURlnOk3nRd TseYZf6i5XR4ZBLM4RqoD+6SBf/+IQ+H9lAePcV73+ZR3fpUTPcSaIn/sKVCbHttVJAfdw BKnSG0Fcao7DI6jeeXZww38Dp858/b387FQDO2EJO/qETq+qArvfcZcYhY/UDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rt4xuoBtr2ZHxxTVeUMYHvZ/LXzN685VKCcB+FvRKBE=; b=SqZ7DVmSMVvJ+ZAr6P8UyBa8VxGoGu9PXbpcWMhGmsNOa04OJ/dQh47Ph8sCLlyND8jOS5 3RGtpISqOj9NCwkYtfeGuXnnOGj4dfh8n5WkP6/NQfg/LCCQXDbJMGdLcUi/p03aFNqv87 Gw9ogaA4lvukOd6unUbz3PfLYC1zNR3RSGnQwLrjQILdzS9B2NplPB4WIPTL0ruU+KgreD Mh7lYNAYjDUM79ZkP24D84IkbT1pU3QmXCBG4y3nMbMSwxwmYoyy8g9JVcCxqYazpagISw TIsoTBXgXqb1EA3FK5MdWEATkON3ofowgVdKl1vPsX37PXyk7JbnfSktRUT0NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765023677; a=rsa-sha256; cv=none; b=RaNdaG/sJ7XHOMSgo3r+N/vafedGk8ZGOEsRyjGqWFvnuBJG2XKbeRtdr4meylq4b9J396 VfkMWDQsUOzAGc3w8iMEghuPiqc2ggbeId6p1xbwG5/MkpkSNNbxOd+ZRrYhlsaF7WJMYG WRlZ/Y3knwXyzN9arKhZ4+fVMqI569riQkuxh3KvwKFBoiXCIDBEAQ/MR6jSctMkflD5EZ 7dQ/Z9zqkK7t6Why72/U6D4xVB8+3GSpkKu6HtJcKLSxUhhu0AgU8asyfsCnuQRrLdcXRa EgxmpNcNBMF5F0LV2DJIqiZe06XsX0SSjfC/Fx+ZLjWNeh9H3HxMHNppYdZhOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR12J1fzwSj for ; Sat, 06 Dec 2025 12:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id db19 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 12:21:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 30aa5507f349 - main - locale: make build to bump widths.txt List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30aa5507f349f761770c5cf49989d6cf7eb3498d Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 12:21:16 +0000 Message-Id: <69341fbc.db19.1a24e656@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=30aa5507f349f761770c5cf49989d6cf7eb3498d commit 30aa5507f349f761770c5cf49989d6cf7eb3498d Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:16 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-06 12:20:16 +0000 locale: make build to bump widths.txt Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53916 --- tools/tools/locale/etc/final-maps/map.UTF-8 | 2 +- tools/tools/locale/etc/final-maps/widths.txt | 190 ++++++++++++++++++++++++++- 2 files changed, 190 insertions(+), 2 deletions(-) diff --git a/tools/tools/locale/etc/final-maps/map.UTF-8 b/tools/tools/locale/etc/final-maps/map.UTF-8 index 6c3431c99b90..7d2c7049f961 100644 --- a/tools/tools/locale/etc/final-maps/map.UTF-8 +++ b/tools/tools/locale/etc/final-maps/map.UTF-8 @@ -5,7 +5,7 @@ # charset: UTF-8 ###################### ################################################################################################# -# Copyright © 1991-2024 Unicode, Inc. +# Copyright © 1991-2025 Unicode, Inc. # For terms of use, see http://www.unicode.org/copyright.html # SPDX-License-Identifier: Unicode-3.0 # CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) diff --git a/tools/tools/locale/etc/final-maps/widths.txt b/tools/tools/locale/etc/final-maps/widths.txt index 3d0535be3884..06f8e9598573 100644 --- a/tools/tools/locale/etc/final-maps/widths.txt +++ b/tools/tools/locale/etc/final-maps/widths.txt @@ -1,6 +1,6 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. The data is obtained from the -# utf8proc 2.9.0. +# utf8proc 2.10.0. # ----------------------------------------------------------------------------- WIDTH 0 @@ -1422,6 +1422,14 @@ WIDTH 2 2 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 2 2 2 @@ -1435,6 +1443,12 @@ WIDTH 2 2 2 + 2 + 2 + 2 + 2 + 2 + 2 2 2 2 @@ -9436,6 +9450,70 @@ WIDTH 2 2 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 2 2 2 @@ -52482,6 +52560,116 @@ WIDTH 0 0 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 0 0 From nobody Sat Dec 6 12:21:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR31WN9z6Kcfr for ; Sat, 06 Dec 2025 12:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNnR23dkSz3XW3 for ; Sat, 06 Dec 2025 12: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=1765023678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zN4hAAr8qOtvzdUJcCNZ4Plij8Z250AKb+uQ2KJUtGw=; b=GaUc3xrELhsXcm8IN38HjI9oJ9p+AseePd6IuGkG+mKqC2x+f6g5kj4KSFlIak+Te39Vuw beAkb7iIqal2X8zSSflT1vHYuffT0HVQ5KWqFSQIPWO08exge/mwS5P5RhVUfzworYqCfJ Xasve5qgTDuXRJ8tl9ViSp8RuZgvstNtnk9HdYunHoFMzplqAfAOhfFuHq2OXiJmbVz3pB eCa0lq60oXH4GKylIpzksIr+olaUmtMRXX9XjFss8OP7HWQQENd/Rezrkne04ZrI78/Wiv WTIcYyE793h7SxLh0nPv1auRlR7LIA/WJUSaE0D4/nVyTvHve4bit1kCeTzEAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zN4hAAr8qOtvzdUJcCNZ4Plij8Z250AKb+uQ2KJUtGw=; b=e1hkYkUUAULZMTNrI6+o8MIN1TNFrr1b9CMiPVgDohGJvXnRJD+7wOeLSTiJW6jz4t4/oh pTv2qHQQsNY7wsbp8rHCfGndmCCUU5ZRCkob4N6uOHwyju/LiBeGKsB0yfnGIfxz+jPoXb P/r4ca+tsbYw88MRA3ju9ORA9G8N00h8jnwuL6eMrLoN0dzD3uxWxoJgzEaZ29ydLBDmzZ OiT+Xzoi/Hkfen6lZ563nVPZx+D0PeQVOj3Nb+5XQV9D6Q0FoeCebuTMGq/DnjroB4T7nm vaZCDpAZBrd4WNCFU68Gfd9B/MuRqxiz273AVhzm5JL3mWJOkopw4UljLW+T2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765023678; a=rsa-sha256; cv=none; b=LkMzNGKZJBUvw55GNN7u/C8YLllw+ac+J8NFYI4Vo5ClXF6TFOkUBxpPkfTSgk0EgChnNq yC8uReK6hQ2wBEiTGB+fb5T3Gjsfc98BlA1QtKfJUHXDB4ep9Ho1/5bIdgS3rBRQpElMyZ jG7PirbPWsR332razJVvE+t68O3gCnbqncwrIKXXyZdESu1ogtWj6eXJbvAjsWIpmuKqWK fMRfZBvZFG/XzqIpuH0+dE6ookac8x3eB0WjRy1X/uIDJve/tRRvchQHiURiTrRjARqkuE AxOJhV2vTqYJbE7y2ReWM/F9ToupK/asCSEw9HYFQQhEfX9izKPK0OopqgWhaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR239vJzwj0 for ; Sat, 06 Dec 2025 12:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d40c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 12:21:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 9df8243a2e0a - main - locale: make posix List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9df8243a2e0ab1ef027cbfbcb4105f5f0ce108e1 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 12:21:18 +0000 Message-Id: <69341fbe.d40c.b952066@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=9df8243a2e0ab1ef027cbfbcb4105f5f0ce108e1 commit 9df8243a2e0ab1ef027cbfbcb4105f5f0ce108e1 Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:17 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-06 12:20:17 +0000 locale: make posix Run make posix to generate monetary definition files with the international parameters missing from localeconv(3)'s lconv struct. Manually convert the "frozen" non-unicode locales under share/monetdef. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53917 --- share/monetdef/be_BY.CP1131.src | 18 ++++++++++++++++++ share/monetdef/be_BY.ISO8859-5.src | 18 ++++++++++++++++++ share/monetdef/bg_BG.CP1251.src | 18 ++++++++++++++++++ share/monetdef/cs_CZ.ISO8859-2.src | 18 ++++++++++++++++++ share/monetdef/da_DK.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/en_AU.US-ASCII.src | 18 ++++++++++++++++++ share/monetdef/en_CA.US-ASCII.src | 18 ++++++++++++++++++ share/monetdef/en_GB.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/en_GB.US-ASCII.src | 18 ++++++++++++++++++ share/monetdef/en_HK.ISO8859-1.src | 18 ++++++++++++++++++ share/monetdef/en_IE.ISO8859-1.src | 18 ++++++++++++++++++ share/monetdef/en_IE.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/en_NZ.US-ASCII.src | 18 ++++++++++++++++++ share/monetdef/en_SG.ISO8859-1.src | 18 ++++++++++++++++++ share/monetdef/en_US.US-ASCII.src | 18 ++++++++++++++++++ share/monetdef/en_ZA.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/en_ZA.US-ASCII.src | 18 ++++++++++++++++++ share/monetdef/es_AR.ISO8859-1.src | 18 ++++++++++++++++++ share/monetdef/es_MX.ISO8859-1.src | 18 ++++++++++++++++++ share/monetdef/fr_CA.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/fr_CH.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/hi_IN.ISCII-DEV.src | 18 ++++++++++++++++++ share/monetdef/hr_HR.ISO8859-2.src | 18 ++++++++++++++++++ share/monetdef/hu_HU.ISO8859-2.src | 18 ++++++++++++++++++ share/monetdef/hy_AM.ARMSCII-8.src | 18 ++++++++++++++++++ share/monetdef/is_IS.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/it_CH.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/it_IT.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/ja_JP.SJIS.src | 18 ++++++++++++++++++ share/monetdef/ja_JP.eucJP.src | 18 ++++++++++++++++++ share/monetdef/ko_KR.eucKR.src | 18 ++++++++++++++++++ share/monetdef/nb_NO.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/nl_BE.ISO8859-1.src | 18 ++++++++++++++++++ share/monetdef/nl_BE.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/nl_NL.ISO8859-1.src | 18 ++++++++++++++++++ share/monetdef/nl_NL.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/nn_NO.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/pl_PL.ISO8859-2.src | 18 ++++++++++++++++++ share/monetdef/pt_BR.ISO8859-1.src | 18 ++++++++++++++++++ share/monetdef/ro_RO.ISO8859-2.src | 18 ++++++++++++++++++ share/monetdef/ru_RU.CP866.src | 18 ++++++++++++++++++ share/monetdef/ru_RU.ISO8859-5.src | 18 ++++++++++++++++++ share/monetdef/ru_RU.KOI8-R.src | 18 ++++++++++++++++++ share/monetdef/sl_SI.ISO8859-2.src | 18 ++++++++++++++++++ share/monetdef/sr_RS.ISO8859-2.src | 18 ++++++++++++++++++ share/monetdef/sv_FI.ISO8859-1.src | 18 ++++++++++++++++++ share/monetdef/sv_FI.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/sv_SE.ISO8859-15.src | 18 ++++++++++++++++++ share/monetdef/tr_TR.ISO8859-9.src | 18 ++++++++++++++++++ share/monetdef/uk_UA.CP1251.src | 18 ++++++++++++++++++ share/monetdef/uk_UA.ISO8859-5.src | 18 ++++++++++++++++++ share/monetdef/uk_UA.KOI8-U.src | 18 ++++++++++++++++++ share/monetdef/zh_CN.GB2312.src | 18 ++++++++++++++++++ share/monetdef/zh_CN.GBK.src | 18 ++++++++++++++++++ share/monetdef/zh_CN.eucCN.src | 18 ++++++++++++++++++ share/monetdef/zh_TW.Big5.src | 18 ++++++++++++++++++ share/monetdef_unicode/af_ZA.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/am_ET.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ar_AE.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ar_EG.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ar_JO.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ar_MA.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ar_QA.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ar_SA.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/be_BY.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/bg_BG.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/cs_CZ.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/da_DK.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/de_AT.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/en_AU.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/en_CA.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/en_GB.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/en_NZ.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/en_PH.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/en_SG.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/en_US.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/en_ZA.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/es_AR.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/es_CR.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/es_MX.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/fa_AF.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/fa_IR.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/fr_CA.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/fr_CH.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/fr_FR.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ga_IE.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/he_IL.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/hi_IN.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/hu_HU.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/hy_AM.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/is_IS.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/it_CH.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/it_IT.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ja_JP.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/kk_KZ.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ko_KR.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/mn_MN.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/nl_NL.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/pl_PL.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/pt_BR.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ro_RO.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/ru_RU.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/se_NO.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/sk_SK.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/sl_SI.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/sr_RS.UTF-8@latin.src | 18 ++++++++++++++++++ share/monetdef_unicode/sv_FI.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/sv_SE.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/tr_TR.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/uk_UA.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/zh_CN.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/zh_HK.UTF-8.src | 18 ++++++++++++++++++ share/monetdef_unicode/zh_TW.UTF-8.src | 18 ++++++++++++++++++ 113 files changed, 2034 insertions(+) diff --git a/share/monetdef/be_BY.CP1131.src b/share/monetdef/be_BY.CP1131.src index 04c7cddf5a1c..93e9f52c3724 100644 --- a/share/monetdef/be_BY.CP1131.src +++ b/share/monetdef/be_BY.CP1131.src @@ -47,4 +47,22 @@ Br # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/be_BY.ISO8859-5.src b/share/monetdef/be_BY.ISO8859-5.src index 0d976d56952e..37d019b2ef54 100644 --- a/share/monetdef/be_BY.ISO8859-5.src +++ b/share/monetdef/be_BY.ISO8859-5.src @@ -47,4 +47,22 @@ Br # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/bg_BG.CP1251.src b/share/monetdef/bg_BG.CP1251.src index 4ecb7ca69d54..cfbc126f81f5 100644 --- a/share/monetdef/bg_BG.CP1251.src +++ b/share/monetdef/bg_BG.CP1251.src @@ -47,4 +47,22 @@ BGN # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/cs_CZ.ISO8859-2.src b/share/monetdef/cs_CZ.ISO8859-2.src index 1157dc869f09..22fc34d891af 100644 --- a/share/monetdef/cs_CZ.ISO8859-2.src +++ b/share/monetdef/cs_CZ.ISO8859-2.src @@ -47,4 +47,22 @@ K # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/da_DK.ISO8859-15.src b/share/monetdef/da_DK.ISO8859-15.src index 3985d4b6b8d1..1e36d27f6223 100644 --- a/share/monetdef/da_DK.ISO8859-15.src +++ b/share/monetdef/da_DK.ISO8859-15.src @@ -47,4 +47,22 @@ kr. # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_AU.US-ASCII.src b/share/monetdef/en_AU.US-ASCII.src index d575632f51a4..5e10a548553d 100644 --- a/share/monetdef/en_AU.US-ASCII.src +++ b/share/monetdef/en_AU.US-ASCII.src @@ -47,4 +47,22 @@ $ # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_CA.US-ASCII.src b/share/monetdef/en_CA.US-ASCII.src index c5ccb89feec3..279ab212b8f6 100644 --- a/share/monetdef/en_CA.US-ASCII.src +++ b/share/monetdef/en_CA.US-ASCII.src @@ -47,4 +47,22 @@ $ # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_GB.ISO8859-15.src b/share/monetdef/en_GB.ISO8859-15.src index 869ddf754511..e2c49f8c56bd 100644 --- a/share/monetdef/en_GB.ISO8859-15.src +++ b/share/monetdef/en_GB.ISO8859-15.src @@ -47,4 +47,22 @@ GBP # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_GB.US-ASCII.src b/share/monetdef/en_GB.US-ASCII.src index b9e88de73fa5..b203b7b97c91 100644 --- a/share/monetdef/en_GB.US-ASCII.src +++ b/share/monetdef/en_GB.US-ASCII.src @@ -47,4 +47,22 @@ GBP # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_HK.ISO8859-1.src b/share/monetdef/en_HK.ISO8859-1.src index faf104e580f9..644d893193a9 100644 --- a/share/monetdef/en_HK.ISO8859-1.src +++ b/share/monetdef/en_HK.ISO8859-1.src @@ -47,4 +47,22 @@ HK$ # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_IE.ISO8859-1.src b/share/monetdef/en_IE.ISO8859-1.src index 0f45ca65a815..0780bafc6b88 100644 --- a/share/monetdef/en_IE.ISO8859-1.src +++ b/share/monetdef/en_IE.ISO8859-1.src @@ -47,4 +47,22 @@ Eu # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_IE.ISO8859-15.src b/share/monetdef/en_IE.ISO8859-15.src index 81d1443a31fd..986a97e3e1bc 100644 --- a/share/monetdef/en_IE.ISO8859-15.src +++ b/share/monetdef/en_IE.ISO8859-15.src @@ -47,4 +47,22 @@ EUR # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_NZ.US-ASCII.src b/share/monetdef/en_NZ.US-ASCII.src index d1db38293199..26cc0d7eba98 100644 --- a/share/monetdef/en_NZ.US-ASCII.src +++ b/share/monetdef/en_NZ.US-ASCII.src @@ -47,4 +47,22 @@ $ # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_SG.ISO8859-1.src b/share/monetdef/en_SG.ISO8859-1.src index 6e8a6eb10fdc..4764a5116b0c 100644 --- a/share/monetdef/en_SG.ISO8859-1.src +++ b/share/monetdef/en_SG.ISO8859-1.src @@ -47,4 +47,22 @@ $ # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_US.US-ASCII.src b/share/monetdef/en_US.US-ASCII.src index 6fb1bf4e9649..a17374f4ae1c 100644 --- a/share/monetdef/en_US.US-ASCII.src +++ b/share/monetdef/en_US.US-ASCII.src @@ -47,4 +47,22 @@ $ # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_ZA.ISO8859-15.src b/share/monetdef/en_ZA.ISO8859-15.src index 9f2ba68c0953..944db959e1ea 100644 --- a/share/monetdef/en_ZA.ISO8859-15.src +++ b/share/monetdef/en_ZA.ISO8859-15.src @@ -47,4 +47,22 @@ R # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/en_ZA.US-ASCII.src b/share/monetdef/en_ZA.US-ASCII.src index 6756cfaff99e..044a4f3a69e3 100644 --- a/share/monetdef/en_ZA.US-ASCII.src +++ b/share/monetdef/en_ZA.US-ASCII.src @@ -47,4 +47,22 @@ R # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/es_AR.ISO8859-1.src b/share/monetdef/es_AR.ISO8859-1.src index 87c6f3462737..2566a212ed9e 100644 --- a/share/monetdef/es_AR.ISO8859-1.src +++ b/share/monetdef/es_AR.ISO8859-1.src @@ -47,4 +47,22 @@ $ # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/es_MX.ISO8859-1.src b/share/monetdef/es_MX.ISO8859-1.src index c65dce11043a..1973748553a5 100644 --- a/share/monetdef/es_MX.ISO8859-1.src +++ b/share/monetdef/es_MX.ISO8859-1.src @@ -47,4 +47,22 @@ $ # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/fr_CA.ISO8859-15.src b/share/monetdef/fr_CA.ISO8859-15.src index 65c6b0727979..ff74b24d8207 100644 --- a/share/monetdef/fr_CA.ISO8859-15.src +++ b/share/monetdef/fr_CA.ISO8859-15.src @@ -47,4 +47,22 @@ $ # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/fr_CH.ISO8859-15.src b/share/monetdef/fr_CH.ISO8859-15.src index 49261a06dc8f..82932939d304 100644 --- a/share/monetdef/fr_CH.ISO8859-15.src +++ b/share/monetdef/fr_CH.ISO8859-15.src @@ -47,4 +47,22 @@ CHF # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/hi_IN.ISCII-DEV.src b/share/monetdef/hi_IN.ISCII-DEV.src index 0f58fd6e9461..035c0e5bd627 100644 --- a/share/monetdef/hi_IN.ISCII-DEV.src +++ b/share/monetdef/hi_IN.ISCII-DEV.src @@ -47,4 +47,22 @@ INR # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/hr_HR.ISO8859-2.src b/share/monetdef/hr_HR.ISO8859-2.src index 05a75c9b53e1..5ed037f3acfd 100644 --- a/share/monetdef/hr_HR.ISO8859-2.src +++ b/share/monetdef/hr_HR.ISO8859-2.src @@ -47,4 +47,22 @@ HRK # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/hu_HU.ISO8859-2.src b/share/monetdef/hu_HU.ISO8859-2.src index a6550bb27031..ff9e968a6b8f 100644 --- a/share/monetdef/hu_HU.ISO8859-2.src +++ b/share/monetdef/hu_HU.ISO8859-2.src @@ -47,4 +47,22 @@ Ft # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/hy_AM.ARMSCII-8.src b/share/monetdef/hy_AM.ARMSCII-8.src index 260d61e853fb..b3fbd859def8 100644 --- a/share/monetdef/hy_AM.ARMSCII-8.src +++ b/share/monetdef/hy_AM.ARMSCII-8.src @@ -47,4 +47,22 @@ AMD # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/is_IS.ISO8859-15.src b/share/monetdef/is_IS.ISO8859-15.src index aa054fd1856a..e854f72000c9 100644 --- a/share/monetdef/is_IS.ISO8859-15.src +++ b/share/monetdef/is_IS.ISO8859-15.src @@ -47,4 +47,22 @@ ISK # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/it_CH.ISO8859-15.src b/share/monetdef/it_CH.ISO8859-15.src index 527926f0dc2a..68f2fea6c0b9 100644 --- a/share/monetdef/it_CH.ISO8859-15.src +++ b/share/monetdef/it_CH.ISO8859-15.src @@ -47,4 +47,22 @@ CHF # # n_sign_posn 4 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +4 # EOF diff --git a/share/monetdef/it_IT.ISO8859-15.src b/share/monetdef/it_IT.ISO8859-15.src index 34f343226766..d804775866f0 100644 --- a/share/monetdef/it_IT.ISO8859-15.src +++ b/share/monetdef/it_IT.ISO8859-15.src @@ -47,4 +47,22 @@ EUR # # n_sign_posn 1 +# +# int_p_cs_precedes +0 +# +# int_n_cs_precedes +0 +# +# int_p_sep_by_space +1 +# +# int_n_sep_by_space +1 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/ja_JP.SJIS.src b/share/monetdef/ja_JP.SJIS.src index 25e84b0c7806..07f7fc765433 100644 --- a/share/monetdef/ja_JP.SJIS.src +++ b/share/monetdef/ja_JP.SJIS.src @@ -47,4 +47,22 @@ JPY # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/ja_JP.eucJP.src b/share/monetdef/ja_JP.eucJP.src index 332d772c1e79..41328a6cdeb8 100644 --- a/share/monetdef/ja_JP.eucJP.src +++ b/share/monetdef/ja_JP.eucJP.src @@ -47,4 +47,22 @@ JPY # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/ko_KR.eucKR.src b/share/monetdef/ko_KR.eucKR.src index 2305b17c3b1c..9f56738e2341 100644 --- a/share/monetdef/ko_KR.eucKR.src +++ b/share/monetdef/ko_KR.eucKR.src @@ -47,4 +47,22 @@ KRW # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 +# +# int_p_sep_by_space +0 +# +# int_n_sep_by_space +0 +# +# int_p_sign_posn +1 +# +# int_n_sign_posn +1 # EOF diff --git a/share/monetdef/nb_NO.ISO8859-15.src b/share/monetdef/nb_NO.ISO8859-15.src index a6483cf4046e..6882efc62bcb 100644 --- a/share/monetdef/nb_NO.ISO8859-15.src +++ b/share/monetdef/nb_NO.ISO8859-15.src @@ -47,4 +47,22 @@ kr # # n_sign_posn 1 +# +# int_p_cs_precedes +1 +# +# int_n_cs_precedes +1 *** 2200 LINES SKIPPED *** From nobody Sat Dec 6 12:21:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR42ZKQz6Kckm for ; Sat, 06 Dec 2025 12:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNnR34cMPz3Xdw for ; Sat, 06 Dec 2025 12:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slRGuuqToeBIjrEn5Mdjvffq4ZkhiDWCVojqH8BGL00=; b=RPXTjGJzQqdDCIAOcK714scttLRtMEXFJ4QMkJMzqzMgtT5gwNz7h6G/wjzzwtvMm6T+Id 52Qn+yPOWMQyStgOAj15zvBF53/eB3qTFJWmwRh4y4mwwz28svjSZ1HEPRBbx8tFe4/PnU 65dZeHupq4syUbBYDBlLzsDOg8D4IckRouOJgWmP0/i4JDOSMoxJYYDFOZ6cou7+IqQ8vZ OGQaz2AWPIXC0oUSOjNz9YjMIuM0pSLVHf2j4s58fJbrqbDu/usEV424yyc8y8Er7By1z8 YYJRPtMDl8oEsecugK4Oi0MsATv7H2GFTpO3NRtDN0L3C+i//IG111SL8vgvPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=slRGuuqToeBIjrEn5Mdjvffq4ZkhiDWCVojqH8BGL00=; b=XwoV9mCRzf9OQvvmB6fSXuifa0cAaTXawSgPhYFk6R0f/UEsbkIovF+ZS4TJNbxYkKsvI9 1KisJo7XaE0hjrTwFOZpv9gehnMoCZbYxO1Ctnv3ioFWufTY0h6BDobGWY05jim+2OhOyU hXBf3eCriZPtq30CrE11pGeWLLQv0TSlOK7ulY2cz5p8OLWIsY4YltJYDRQ0QIzwcW0gjn QDUwrT0ZdAuS9kBrih5cfefCdBxzM0AisP3YvWx5PdMIef6Bgd5G4XXXcYlTx1ti6P9wDt fefG8QSYPUbTdXZ0kGblv2P7k3+frcI8DvIqt8S27PXjisUrOThzIM5NlsBPRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765023679; a=rsa-sha256; cv=none; b=X5LymBIQFuH0KEqIp4dkNiskv0UQF0xwuRYrFWbfjjinNbCnOlcCzCfDRJRIaA8hADpPJe /VWvdwLdaQSQbQDrmvnXNCmjW/JiH4sirzSF2MGklkn9mZKZZSYbEgKMv0D8BEzeFI07RZ KXRy0H3ASqWOLeMMv7/NJni4YlQ2Jm+x1Mr30kqr1Cc08nwfzdXrEQEFVTtWTDUjhdESFc R32tA91xdsdbQsf+TLzdPXJFxzfp4a9FjRHUDC4oB4ZpYCru9YyR/Z1BU3g/4YaGDnkRbW yqJBFAyLf9mGPQwIjp/2q1d7eRQnCndt9wjvUwdBHVOfyKj29hWE1MsRbeEw6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR33vzCzwRG for ; Sat, 06 Dec 2025 12:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id db1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 12:21:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 95f37aa3e51c - main - cldr2def.pl: Fix make install List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95f37aa3e51ce46821059b2c9dbb02fef5c4bec5 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 12:21:19 +0000 Message-Id: <69341fbf.db1d.796a93ec@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=95f37aa3e51ce46821059b2c9dbb02fef5c4bec5 commit 95f37aa3e51ce46821059b2c9dbb02fef5c4bec5 Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:18 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-06 12:20:18 +0000 cldr2def.pl: Fix make install Follow up on 86c71e97d19f ("pkgbase: locales: Also tag the files dir"), and adapt cldr2def.pl script in order to fix make install. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53961 --- tools/tools/locale/tools/cldr2def.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index 998e176de918..f0aaf07c02d9 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -923,6 +923,7 @@ sub make_makefile { ".for f t in \${LOCALES_MAPPED}\n" . "FILES+=\t\$t.LC_COLLATE\n" . "FILESDIR_\$t.LC_COLLATE=\t\${LOCALEDIR}/\$t\n" . + "FILESDIR_\$t.LC_COLLATEPACKAGE=\tlocales\n" . "\$t.LC_COLLATE: \${.CURDIR}/\$f.src\n" . "\tlocaledef \${LOCALEDEF_ENDIAN} -D -U " . "-i \${.ALLSRC} \\\n" . @@ -1102,6 +1103,7 @@ SYMLINKS+= ../\$f/\${FILESNAME} \\ .for f in \${LOCALES} FILESDIR_\${f}.${SRCOUT2}= \${LOCALEDIR}/\${f} +FILESDIR_\${f}.${SRCOUT2}PACKAGE= locales .endfor ${SRCOUT3}.include From nobody Sat Dec 6 12:21:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR56Khjz6Kcnb for ; Sat, 06 Dec 2025 12:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNnR45ft6z3Xjq for ; Sat, 06 Dec 2025 12:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ln6UvFgvqBBJi1wPec9qU8Pg9Ozmt5Ei22Fg2bfavrw=; b=P1zcAmOmm6xPLqCvEJKquNsoHzrvLsj17gQHN98dcP7gc8VpBFyCsThGOLiaQYyK2F3r8M ss9DbFCuZasHYMxvCeXPkksN0c3YmPkuh7z2ge6xYdtFEJo3nOofssDV57dcyRcTAzuKpC FHhqG2nrxdI/UB5ZZLU+7OTGb2TVdmYeqzafbENlWb6dJQ7H4ZgVnn5bman4vPzBXQLRnN W7/ThsOr4CnGRl8h0W/1euCy7RxqU80ibeoLO0YsfydKmGQHKN88HK2KNnmWns67mTjlSV ZCjfXS0OcUhewM/DesQQ+LaQc3he7H0GhQ/u05tVSxOCSr9xt77048TxR3UwLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ln6UvFgvqBBJi1wPec9qU8Pg9Ozmt5Ei22Fg2bfavrw=; b=UqXxtwPofIoNMh8RDLNpO876X8szCQ50SK69CU0veqZ4O3aoAqBkdTDZzbqscCh99WOPlz o+UQO8kSAwnTjkc300o5EzvHyEyKS5Sg/zP8BL26uuwiPSEhGNlNeWqUH2JmWvMDQBZuSs G2kpIPLFpsLkszuOHfeYtGKx9mugCxofLz2NfRHbpegnsj2tInQcvYY1K1XxsPsIq1axVT /n/X7dDjrwtdFjECb1WdH8J8xsqlCOr3/ryyRoiEFsANt2kg+SqdjW8qEiAaZ10SqpeRJz tsHrUY12zPtLM5Cfcbz6IMvCSugUjjHiAsGZlbmPhZxmMZOX5Vjjj0m0kcerxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765023680; a=rsa-sha256; cv=none; b=JNhiPh+1S5mzU4AcJdMGETjwoZTBPjg3bviymjIiGT/slx+brtjTFsGaAbBSzblSRszzAt fMTtS8lFbdn9fBlJ5vLFHss0xtML55N0fAU1i++G+qm8/aG2D0Y6oxkbK3S5URqDDdYT/n 5R5kbGRZs0+aZ+GgC9KtlZUU1h/AZqA6N9A+RljM0XSeU9Q6ECKj5USEB/gGrCFgYYplJg 3uUwSoe9wBT52IkE7jVoHpm8oos9DcX7C8G0J1LaP7CKIvszMOXChhgwVX3kPU2v4fuiNM I3mEJBjdcuI9afqTrAyb12dOkwOpF+RpOmV7yF0AIiTYSuV/Qyvi9V2Oeu8CMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR44fSJzwGk for ; Sat, 06 Dec 2025 12:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c1a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 12:21:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 36cfa8093d25 - main - locale: make install List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36cfa8093d25f8a5b598bd8ae74d7cbaafdc1879 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 12:21:20 +0000 Message-Id: <69341fc0.c1a7.714efd8@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=36cfa8093d25f8a5b598bd8ae74d7cbaafdc1879 commit 36cfa8093d25f8a5b598bd8ae74d7cbaafdc1879 Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:18 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-06 12:20:18 +0000 locale: make install Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53962 --- share/colldef_unicode/Makefile | 2 ++ share/monetdef_unicode/Makefile | 1 + share/msgdef_unicode/Makefile | 1 + share/numericdef_unicode/Makefile | 1 + 4 files changed, 5 insertions(+) diff --git a/share/colldef_unicode/Makefile b/share/colldef_unicode/Makefile index 464f631fe309..16fd2fc92e34 100644 --- a/share/colldef_unicode/Makefile +++ b/share/colldef_unicode/Makefile @@ -114,11 +114,13 @@ SYMLINKS+= ../$f/${FILESNAME} \ .for f in ${LOCALES} FILESDIR_${f}.LC_COLLATE= ${LOCALEDIR}/${f} +FILESDIR_${f}.LC_COLLATEPACKAGE= locales .endfor .for f t in ${LOCALES_MAPPED} FILES+= $t.LC_COLLATE FILESDIR_$t.LC_COLLATE= ${LOCALEDIR}/$t +FILESDIR_$t.LC_COLLATEPACKAGE= locales $t.LC_COLLATE: ${.CURDIR}/$f.src localedef ${LOCALEDEF_ENDIAN} -D -U -i ${.ALLSRC} \ -V ${CLDR_VERSION} \ diff --git a/share/monetdef_unicode/Makefile b/share/monetdef_unicode/Makefile index c19c4ca07f02..ecc19b9f5ff3 100644 --- a/share/monetdef_unicode/Makefile +++ b/share/monetdef_unicode/Makefile @@ -106,6 +106,7 @@ SYMLINKS+= ../$f/${FILESNAME} \ .for f in ${LOCALES} FILESDIR_${f}.out= ${LOCALEDIR}/${f} +FILESDIR_${f}.outPACKAGE= locales .endfor .include diff --git a/share/msgdef_unicode/Makefile b/share/msgdef_unicode/Makefile index 8d966b73c15c..45d51c009553 100644 --- a/share/msgdef_unicode/Makefile +++ b/share/msgdef_unicode/Makefile @@ -106,6 +106,7 @@ SYMLINKS+= ../$f/${FILESNAME} \ .for f in ${LOCALES} FILESDIR_${f}.out= ${LOCALEDIR}/${f} +FILESDIR_${f}.outPACKAGE= locales .endfor .include diff --git a/share/numericdef_unicode/Makefile b/share/numericdef_unicode/Makefile index 6b0d6b52a13d..7e81f9309899 100644 --- a/share/numericdef_unicode/Makefile +++ b/share/numericdef_unicode/Makefile @@ -106,6 +106,7 @@ SYMLINKS+= ../$f/${FILESNAME} \ .for f in ${LOCALES} FILESDIR_${f}.out= ${LOCALEDIR}/${f} +FILESDIR_${f}.outPACKAGE= locales .endfor .include From nobody Sat Dec 6 12:21:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR641vtz6KcwN for ; Sat, 06 Dec 2025 12:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNnR56VXrz3XbW for ; Sat, 06 Dec 2025 12:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EdRnB+xDeIfpNAMn5XwHQGrQpOZAGDfW+6+t+8i2E7w=; b=jtyuBRkI0TymPPq180ZltxKzXhsKjQxu66wnMgpnB/B6URdqE69UQCpaGII95kwgsESf5I TIf1sEsTjSYSdgd0l25rVGMqDWb3dDlmT+lLQyIHpSf+Mw2AQKWarjIyJBcW/kh480UGsc togwWrLRRjliuqzc/MdQEs7bb1FaCGop4W9URgrD0qV933j+q+aWs78HyZJXFsrhZ8qOxd sna857+sXj1uKMSzZYRN5K7gVNnTb1Gu/4i3sZ9p6RbXMDzJznlYRPxWVmzx9unge9RADl i3tRaGDGTKe3Rvli6FYt7ReGuWMDvgpTbLWtuubRVgu8jpp23G2B9seM6hav4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EdRnB+xDeIfpNAMn5XwHQGrQpOZAGDfW+6+t+8i2E7w=; b=Dy+2IkkHin38zb/HWaHLkaZOFDMZhcoSFWRS+xn4aT+mZBgs0rafZtoF2MTelBJz6+5P+1 dWyt5mBm9ZVu3JyeWoAmq7eGD26gryubmr9yGFqg+WLit5/ggtZHyjtwHyh15113V9HlI+ GCOQ0GynMmtYj76C+UJ6PnmBpY7xyx3ieCWaeRgmhO5cWf2nlWmNXU672wi6VYActHSwF5 vMv2Q7BQNK1w1XQ4y7JCChlwIsx6Bb4V0OR/sw+KO53aP41mHmsaqtlpV3ydso8BlGYUab MfNXgnJXcHpx2wfNullpdSyXmjej7azSRv5QmnvbzpxQpPsj1jcBSdHn3hJjKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765023681; a=rsa-sha256; cv=none; b=g7hqU24ikggitGMRaoa6M6G43gJT5UfShNycqkaoVssJKyAX4bqWUl3vMod9qa/Cbwjc5Z Sokz16BSrm4sU8zD83KhuyLUDibKEnZ2faMT4msGL5wa2H5FuPAmfL1Rr6Jxc2Qh4WxcRV yssOdPlZ2p0VpypVtsWALR1dsgiDBzRceJvvuvM5Y6KuAr0Lj4wCTCBasrV5E+znWtENch nsPP2+mddVZqDOu8vUqCGtVurs/EhnMrYepNYr/47dXAcPzvufLT5kwhcSw/vxb7MqmGQn M6hmHiJkR+f98otEWyRSIV+5kWpa9r8gxPmI6qpmWA+P5ZaCTsR7+l9nRzl4zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR5506lzwW5 for ; Sat, 06 Dec 2025 12:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b9d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 12:21:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 934364da7fc8 - main - locale: tools: Make finalize idempotent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 934364da7fc8cd3ba4d030d0478163b41dda1b37 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 12:21:21 +0000 Message-Id: <69341fc1.b9d6.664fafa7@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=934364da7fc8cd3ba4d030d0478163b41dda1b37 commit 934364da7fc8cd3ba4d030d0478163b41dda1b37 Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:19 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-06 12:20:19 +0000 locale: tools: Make finalize idempotent The finalize script renames source files with 3 components in their name into names with two components with an @modifier, in the process. Running the script for a second time without cleaning will strip the @modifier from the files, producing invalid Makefiles and unusable locales. Prevent this by adding a guard at the beginning of the script. Also, use a sub-shell for directory changes to avoid working directory issues. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53981 --- tools/tools/locale/tools/finalize | 115 ++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 55 deletions(-) diff --git a/tools/tools/locale/tools/finalize b/tools/tools/locale/tools/finalize index 23afaddafa9b..b4dc38360451 100755 --- a/tools/tools/locale/tools/finalize +++ b/tools/tools/locale/tools/finalize @@ -69,64 +69,69 @@ AWKCMD="/## PLACEHOLDER/ { \ while ( getline line < \"${TEMP4}\" ) {print line} } \ !/## / { print \$0 }" -# Rename the sources with 3 components name into the POSIX version of the name using @modifier -mkdir -p $old $new -cd $old -pwd -for i in *_*_*.*.src; do - if [ "$i" = "*_*_*.*.src" ]; then - break - fi - oldname=${i%.*} - nname=`echo $oldname | awk '{ split($0, a, "_"); print a[1]"_"a[3]"@"a[2];} '` - mv -f ${oldname}.src ${nname}.src - sed -i '' -e "s/${oldname}/${nname}/g" Makefile -done - -# For variable without @modifier ambiguity do not keep the @modifier -for i in *@*.src; do - if [ "$i" = "*@*.src" ]; then - break - fi - oldname=${i%.*} - shortname=${oldname%@*} - if [ $(ls ${shortname}@* | wc -l) -eq 1 ] ; then - mv -f $i ${shortname}.src - sed -i '' -e "s/${oldname}/${shortname}/g" Makefile - fi -done - -# Rename the modifiers into non abbreviated version -for i in *@Latn.src; do - if [ "$i" = "*@Latn.src" ]; then - break - fi - mv -f ${i} ${i%@*}@latin.src - sed -i '' -e "s/${i%.*}/${i%@*}@latin/g" Makefile -done - -for i in *@Cyrl.src; do - if [ "$i" = "*@Cyrl.src" ]; then - break - fi - mv -f ${i} ${i%@*}@cyrillic.src - sed -i '' -e "s/${i%.*}/${i%@*}@cyrillic/g" Makefile -done - -# On locales with multiple modifiers rename the "default" version without the @modifier -default_locales="sr_RS@cyrillic" -for i in ${default_locales}; do - localename=${i%@*} - mod=${i#*@} - for l in ${localename}.*@${mod}.src; do - if [ "$l" = "${localename}.*@${mod}.src" ]; then +if ! find "$old" -name "*_*_*.*.src" -type f -print -quit | grep -q .; then + exit +fi + +mkdir -p $new +( + cd $old + + # Rename the sources with 3 components name into the POSIX version of the name using @modifier + for i in *_*_*.*.src; do + if [ "$i" = "*_*_*.*.src" ]; then + break + fi + oldname=${i%.*} + nname=`echo $oldname | awk '{ split($0, a, "_"); print a[1]"_"a[3]"@"a[2];} '` + mv -f ${oldname}.src ${nname}.src + sed -i '' -e "s/${oldname}/${nname}/g" Makefile + done + + # For variable without @modifier ambiguity do not keep the @modifier + for i in *@*.src; do + if [ "$i" = "*@*.src" ]; then + break + fi + oldname=${i%.*} + shortname=${oldname%@*} + if [ $(ls ${shortname}@* | wc -l) -eq 1 ] ; then + mv -f $i ${shortname}.src + sed -i '' -e "s/${oldname}/${shortname}/g" Makefile + fi + done + + # Rename the modifiers into non abbreviated version + for i in *@Latn.src; do + if [ "$i" = "*@Latn.src" ]; then break fi - mv -f ${l} ${l%@*}.src - sed -i '' -e "s/${l%.*}/${l%@*}/g" Makefile + mv -f ${i} ${i%@*}@latin.src + sed -i '' -e "s/${i%.*}/${i%@*}@latin/g" Makefile + done + + for i in *@Cyrl.src; do + if [ "$i" = "*@Cyrl.src" ]; then + break + fi + mv -f ${i} ${i%@*}@cyrillic.src + sed -i '' -e "s/${i%.*}/${i%@*}@cyrillic/g" Makefile + done + + # On locales with multiple modifiers rename the "default" version without the @modifier + default_locales="sr_RS@cyrillic" + for i in ${default_locales}; do + localename=${i%@*} + mod=${i#*@} + for l in ${localename}.*@${mod}.src; do + if [ "$l" = "${localename}.*@${mod}.src" ]; then + break + fi + mv -f ${l} ${l%@*}.src + sed -i '' -e "s/${l%.*}/${l%@*}/g" Makefile + done done -done -cd - +) grep '^LOCALES+' ${old}/Makefile > ${TEMP} From nobody Sat Dec 6 12:21:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR81Hg2z6KccV for ; Sat, 06 Dec 2025 12:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNnR76Ztxz3XfY for ; Sat, 06 Dec 2025 12:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OsdcuXan9b0M57CvEISq9gbSjiUZwkW9Ipeyz6LjzWY=; b=ien2bP/6hN41LZkvSBkQKD0OhMR0e5WGLUYXy4dkXP8hDjeSeEGAUlGokKt9WnVeu9oAwn oEAdJUcyqasuHZkjJDaNeRAUSFpADPdoVwgQHYBje5SH1wgo8vXqVALALlm+0M/CP2PUtz 4y0k4NWeabjjlNzauf9fsIPxMZAVpnyKqANVB+r2SujGeowjCzSgN784LIOj2YSaIWNG6N iSD/YKhG5z30q2zMcLcWa+d6XzmFLcJuv3XVhImzGW2d8JDH2mIJIdB2JNtw1CmkQpZ3tF YkyEvnVvz9g3cX5iB/zy/usx8zlTO+kKq6KFxcuStdYplLKAQZsDnHSbk3alyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OsdcuXan9b0M57CvEISq9gbSjiUZwkW9Ipeyz6LjzWY=; b=xeSmo3+/6IRczynzhd/MIxbY6KBuawms+G75XJGSt1JSqHOLwUcGtK2a5Ec1NJScWHNxqi t4fJIenmIreSOxWTD9Nncds8Nhqk+MuovOJHCD8c9yjuozn7eG/RNq4P5rnWAxvU0Fh+5w aqZdapo6GWD7Fv+jkxSG88hdWZLqQTVbbD6HVLferYg2HW3MRwTRJO1IvmXcOVIx/7y38C IuUoTMOf5UraG28HfXAgMi9br1YV1oLA0FRk/OIaYTBpCEaFFQ1nQ/C2sYkkkZ1Vol8tDK 3KD5U2yxrjB7tuv8WL7XILAFvi6yvJ/sxRlkM9ToJ7GSTey6IObVGuDrnEZPCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765023683; a=rsa-sha256; cv=none; b=sNLuQ38fKDUAFIxvfiqBp6koRlkWbNX/LyfhVsTMOFDHEEECbJTf2man0LMVUKDVtNIkDB l2yNKQIJwLCVSuI2ii5bPQ45S/ZKl1pqe4wRhL0U6TBwlhxSJAv7sJxZvIwRKCc1dS5Pgv XSxqhhBgASnwSUd2Wxd+krK7xPCenuLq/xB2SdQkthynCYwPsSzDmC2xMVi1jDRTehqI8g VZkF3UviDrwioCaIZ3jgqXxzPVDUGVosW7ufBrv6NHs3feDPiyGiWOvnGtC/8WZATWleYy XhQH0qtEDVfKiOMN1AwwFuW+FoSrS+xZNho4Ft2EpqlcEBduSQr7LqV2VYLOFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR762sqzwj2 for ; Sat, 06 Dec 2025 12:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b9da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 12:21:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: d20da5c9736c - main - locale: Update Unicode to CLDR 48 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d20da5c9736c3d93fc96e5e1c4dc40bed47bc419 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 12:21:23 +0000 Message-Id: <69341fc3.b9da.703ac818@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=d20da5c9736c3d93fc96e5e1c4dc40bed47bc419 commit d20da5c9736c3d93fc96e5e1c4dc40bed47bc419 Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:20 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-06 12:20:20 +0000 locale: Update Unicode to CLDR 48 Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53983 --- tools/tools/locale/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/locale/Makefile b/tools/tools/locale/Makefile index 3428cdad93dd..24701af85199 100644 --- a/tools/tools/locale/Makefile +++ b/tools/tools/locale/Makefile @@ -7,7 +7,7 @@ # Modified by John Marino to suit DragonFly needs # -CLDRVERSION= 45.0 +CLDRVERSION= 48 UCDVERSION= 17.0.0 .if ${.CURDIR} == ${.OBJDIR} From nobody Sat Dec 6 12:21:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR80NdWz6Kcnh for ; Sat, 06 Dec 2025 12:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNnR66MdKz3XfQ for ; Sat, 06 Dec 2025 12:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tpy/27JrqTxebwbUdMKmBFDxDR/ZHnaSTX0qJ8n1Sko=; b=hw/Lm5Z8An/1pZONI3Wc4Z6GLUZ2QoGNR3nmNUap4TpxfC8dKNprtPZek96uod9sanIxYU 8jXFJuThkcE2EWysAp2YS+nhDCE2yZfusf0O/NzOLTkeilRc6U+IVT3lEpCF1GTul8pCIO xOv0hzal+FtQLzil1L7x9b11cnJcU4VS4paSHRU2EET5dhoY5yC0Lecaxx2VaEXwIxTikc yCCfyu2zH9PzvD+mj2nyd1yDgbkDspH+E2LcwM9SFSK1s3CgKaZDwb+aGs3N/o955/im0F BsVWPIG/YSr/702lVv4aP/+UqaF/Zi3ioEwesExrA6ELcsl4OZ8VsLP+QQmoOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765023682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tpy/27JrqTxebwbUdMKmBFDxDR/ZHnaSTX0qJ8n1Sko=; b=ZnWO6QN3UykoWXu9i0dkjpnRB2L+6BfOZ3fvPbokjH8BXqbAwYXWOP0LruSzplVbpmZchK FlwdpKiObc/pPenSEDL8k8cWSgvwALuW/nBGsTMfa42iUOCTgrKlDCFljUU1howUicCYfX cAwcxox664idgap9GCA8KCei1lqUmZcH4u3UBTGlp5TLQla/VHpyDftu7JeELKyWFBZHN9 fy2J3fk/t4JkShAzJkb8MRaFfQ8O+kU8b23LgTUMOtcIrOKgLI2f5SPJm65o8meIJ7TDQ7 7Uv3DsOwhUZTjxD31VKOeY+0vQaXHessD+wa6AD4CH1+IeftudYRC7/neXPgNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765023682; a=rsa-sha256; cv=none; b=ViW/t8Ns3P7bwBxSEON6skAgPvX3pFg34dmPTsPK3Qt7DXIBTnwKByCAHYUaNa76p8YESK 4yxccHsu+IH6+3w6yeODCUmrh9V0s3tQD6luqb0NxXE5M29L30IeKhyNC/EAdPyO0g/r/x aAvvbu9Nmc/zEvFgKHXLHhopKOH4F8y9R2TtKHY+HA9r0uevwIHrKzpEFyDB81Dk7CnVyd jvNHp+W6pFerHc2+zs2RpkAmhEf+gPzN2OO57sfaymtPetG8fNAlmLE2mfY62sRTDH3l1T wuTaos1WwYQOduG/N9duCFBDQlrASerQTipzjq06YPm3pTBSd+ilyAsukc7izw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNnR65J5lzwGn for ; Sat, 06 Dec 2025 12:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id db21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 12:21:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 13ae4904ad7d - main - locale: Update to UCD 17.0.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13ae4904ad7d4677a8d894c91362f2d2479965b6 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 12:21:22 +0000 Message-Id: <69341fc2.db21.a9b8735@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=13ae4904ad7d4677a8d894c91362f2d2479965b6 commit 13ae4904ad7d4677a8d894c91362f2d2479965b6 Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:19 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-06 12:20:19 +0000 locale: Update to UCD 17.0.0 Starting with Unicode 17.0.0, the zipped versions of the data files are only published in https://www.unicode.org/Public//ucd/ https://www.unicode.org/Public/zipped/ReadMe.txt Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53982 --- tools/tools/locale/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/locale/Makefile b/tools/tools/locale/Makefile index b49c90e691be..3428cdad93dd 100644 --- a/tools/tools/locale/Makefile +++ b/tools/tools/locale/Makefile @@ -8,7 +8,7 @@ # CLDRVERSION= 45.0 -UCDVERSION= 15.0.0 +UCDVERSION= 17.0.0 .if ${.CURDIR} == ${.OBJDIR} .error Do make obj first. @@ -125,7 +125,7 @@ ENCODINGS= UTF-8 \ CLDRFILES_CORE= https://unicode.org/Public/cldr/${CLDRVERSION:R}/core.zip CLDRFILES_KEY= https://unicode.org/Public/cldr/${CLDRVERSION:R}/cldr-keyboards-${CLDRVERSION}.zip CLDRFILES_TOOLS=https://unicode.org/Public/cldr/${CLDRVERSION:R}/cldr-tools-${CLDRVERSION}.jar -CLDRFILES_UCD= https://www.unicode.org/Public/zipped/${UCDVERSION}/UCD.zip +CLDRFILES_UCD= https://www.unicode.org/Public/${UCDVERSION}/ucd/UCD.zip # fetch and extract targets ${UNIDIR}: From nobody Sat Dec 6 14:28:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNrFY2Jnpz6Kmfw for ; Sat, 06 Dec 2025 14:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNrFX75PFz3x02 for ; Sat, 06 Dec 2025 14:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765031297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=II/dRkEN556Lq+HEkEfdda0JuUJ44oxrQLH+Lnop/Fo=; b=cRoE2Ezofw6D4zohvbiylbn/x32oAnPM6V8/kytvWGGLqM8NgAXZyWIA7p3wRoQv8e1YN4 4qJfoeNkZ52e9Kca1Y5g1hIYnRK+ayIImj8Ie9CuL4nltBafYHGb6D3K+FEFy/+iSkMzwb 0fzK6DUiML5/DVDBl03hhUPnz1bpOpTiDphLdCdbeMf7AOF6MzN8BzHxzfuJlW7GBkn3uX 0VHqIC4craKHCv1Qfur+LraZNLW/fLnrKrbJqUNgwhlFLlUwT0/qkwaJi0Zpkz2rhY/fOy A4lEA9O19Mjkgw7NSn8TSUDoj8H656OFbfj/OkwTa+6cBhU7008OzHOXFF4Rog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765031297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=II/dRkEN556Lq+HEkEfdda0JuUJ44oxrQLH+Lnop/Fo=; b=vUHtkvJuSd5EIOaFb8U3NHeTwgf7WNYEyl6JiK8qUCkdq5Z9nIXc5GcezLQzsGxBN7A3oS gyuDfzktaJDAzakh3tKV9qVFklx8IhSANiLk6xl9f//cECQ9RVC2MbG3d1O7TtLujNWbkD PqN7tu7Do5VKd8zwx8c5qyM1jD5FnZN94571wwwHcjguMY2JEkWCylp0+n/LuRuNa0T1Lo YzPmUXsfkVaeilBWTLKKZdOdpMTqCIoOvjhTc8flFoHKk8Y45/u+sZtlW5TJn+SK3A2E8m vVje91sGbiIF5L9y7UcGJgTDkP1TCaP9QZFWhL83KaeN1vKgrwi1F3Ib/5OVrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765031297; a=rsa-sha256; cv=none; b=PGganP8VAreEUzVgAqTWhV+h1MKvyd0wQ6C10O4P2CqQW7WU+KWKhrb8fKErd3e3E2SojP X9ve/ZNfHVAbqEluwdCXCs8QcYuzwrboFKriEP7BuZwCULvbyLI1DWthqRAs3CRAfklta7 COSHMigumXqOv2CnYh20ErOr3QMxhyrWE7IUnt1fYdPKaiNnIjTNN2rkQtaohB/PAQYWvH SjHupsaG6wFBB/flyPQ/iUA+svmAzy30Nuli8MY5YIdAIfLfeeELn8ek+TmS7oJI0D6wQg IW1DsO89JpxgSpaboIeBxTgQS/nEuDB2UbBAjnN9YqphptANx8mKpRDOYgSqXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNrFX6Mfqz10cD for ; Sat, 06 Dec 2025 14:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 298e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 14:28:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 643a606fa274 - main - sndctl(8): Do not free and re-open device List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 643a606fa2742b94f6eca620119b7d2686ca9cd3 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 14:28:16 +0000 Message-Id: <69343d80.298e5.3cd0cd8f@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=643a606fa2742b94f6eca620119b7d2686ca9cd3 commit 643a606fa2742b94f6eca620119b7d2686ca9cd3 Author: Christos Margiolis AuthorDate: 2025-12-06 14:28:08 +0000 Commit: Christos Margiolis CommitDate: 2025-12-06 14:28:08 +0000 sndctl(8): Do not free and re-open device There was a reason for this, but it does not apply anymore. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54031 --- usr.sbin/sndctl/sndctl.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c index 6977f0ab0ebe..e6dac67e2ea7 100644 --- a/usr.sbin/sndctl/sndctl.c +++ b/usr.sbin/sndctl/sndctl.c @@ -992,17 +992,10 @@ next: argv++; } - free_dev(dp); - if (show) { - /* - * Re-read dev to reflect new state in case we changed some - * property. - */ - dp = read_dev(path); print_dev(dp); - free_dev(dp); } + free_dev(dp); return (0); } From nobody Sat Dec 6 16:23:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNtpx3zZwz6HjhC for ; Sat, 06 Dec 2025 16:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNtpx3HDTz3H8S for ; Sat, 06 Dec 2025 16:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765038233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BMbWjIZBAvsnu6urIwrrZJr/8AgLg5IVe89zyuL8nA=; b=prStKoJRlunqo03FybSWE0CB+HDqPY6FvIMErOMfnjyppz4aSVG8L3NEL1KDfYycfqV4N6 Y3UDEZPpdCQB36ScrthWyDEx8oG0Gxwkhfuu8JULPyClt3+0Qpn47kkND6DdFhiazdQDLX 8wDBPFujlpk98HPQLyPeI/YWrWDLYmxPlhfWXvSJ7V7LiI1z7t5FZbDa5mdvjVjtJmVDB+ hNkVdMFd3KWy/Gonc97wD9c29Y35zZ/jA+bLDz9LpcVuOmYHB4wLwNTtoRdtvL4JHgXMG9 mkK8JcvNuQuKmABzvRUEjRA2uSUetVXOcpgGLVr4x6zkrpWgvx4GEr5hgBuPLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765038233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BMbWjIZBAvsnu6urIwrrZJr/8AgLg5IVe89zyuL8nA=; b=mytcfKM4VgHEsjREQ4j1yWZw/xnUDSfy/qNG78LC8c2cPXvMFOZUv1OUoVfYOqb9SCRH9g LMFuQyZ1yvv9J8EJoAgbn9KmeixxxIhihCq57s+31E4YCxQOVyAkZq4WOiiYo6RB6oK2CF BK8kTFLnRW1jiKUfiZ6SBYucxe4HTvbU3JnhJeyZwiURe7iiExEIXxfgvZRXnsrapiTPxw JVpuUmodBopKPSbwviCUExq5RcJQrDu2iOQtVRc5uSsxfHmPCFEo5fU/21N/QeABOWRjXp K7VX1l65TyFbLMBYt48OnCi6NjzPwkPIW0lNW0n8ciRT89hNIK1yekRwX1a96w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765038233; a=rsa-sha256; cv=none; b=lUJSF2fVfTfR6ob7yz3mQV+iqUuVurYz6j/Cf+HrqklWRgujHPzbY5HTDR5oCdo+Zrja7E lJBd6qas8t2cDZaW15/4gcuUwPtczBDfS1ZH8NY9NhG9yTyJHIcWpvRlUUumXHLkJETGE5 XtyCN7l/PY3kCsM6BUnxWv3F3dsjkZt5CHtJtk4/Pz8r/TlSkQP02WLFCyEfXEbR4rfqLI O837BbjePV/Wd+ilPH0k6ndPqYY0v8KD1t9jdL2zokmNL1Dw52laN8S5khqGKr0MnrtH2A N8JH2Mmm77HQ7j0DvK0l74MBM/2jgxZYLWsCtxkMeN7sEbjlLHEhPpk2YwRx6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNtpx2m4fz13Fm for ; Sat, 06 Dec 2025 16:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35cb8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 16:23:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a83191c928cd - main - net: fix LINT-NOIP build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a83191c928cde55f45f2ed4b55e80c07c0e84105 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 16:23:53 +0000 Message-Id: <69345899.35cb8.13372e26@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a83191c928cde55f45f2ed4b55e80c07c0e84105 commit a83191c928cde55f45f2ed4b55e80c07c0e84105 Author: Gleb Smirnoff AuthorDate: 2025-12-06 16:23:19 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-06 16:23:19 +0000 net: fix LINT-NOIP build Fixes: fd131b47f20dbeb515f5e3e6ea87948f2638eda9 --- sys/net/route.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/net/route.c b/sys/net/route.c index 5dbb51a34e56..1a1de22804f0 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -515,7 +515,6 @@ rt_getifa_fib(struct rt_addrinfo *info, u_int fibnum) void rt_updatemtu(struct ifnet *ifp) { - struct rib_head *rnh; #ifdef INET6 uint32_t in6mtu; @@ -524,12 +523,11 @@ rt_updatemtu(struct ifnet *ifp) for (u_int j = 0; j < rt_numfibs; j++) { #ifdef INET - rnh = rt_tables_get_rnh(j, AF_INET); - nhops_update_ifmtu(rnh, ifp, ifp->if_mtu); + nhops_update_ifmtu(rt_tables_get_rnh(j, AF_INET), ifp, + ifp->if_mtu); #endif #ifdef INET6 - rnh = rt_tables_get_rnh(j, AF_INET6); - nhops_update_ifmtu(rnh, ifp, in6mtu); + nhops_update_ifmtu(rt_tables_get_rnh(j, AF_INET6), ifp, in6mtu); #endif } } From nobody Sat Dec 6 16:32:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNv1P40Y6z6HkLk for ; Sat, 06 Dec 2025 16:32: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNv1P303sz3JWk for ; Sat, 06 Dec 2025 16:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765038777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PzjNVH6a/yr4oKbPgaOL+Oqlnf2dgcUioCmJHzmyXqw=; b=yWLQmHi7LZiDmDldEjxHCQvNoyQxpa176bIxYcO4bF1oEdsVLzqxASDRZQIWXffsTW+1af wsvEQjVcyER2TeiLMLN/JJ3nLQrLJJwOvtLsGwgBlZP+kuKbIVDc4///TuoldDT+Yw9sxt vErB5DvzkOYCg/FdgIj2iKvAT/5+FBHfqIVeCLnfwuXU465EICCIJ/W4BHdkyKdod5/pQz yrQ/lXkx7JsRcfocfIFm8j3ZlvtjUrqlHgHBZJbwzGCAMWHmu/nC8hv3C69i/PogCDML7O 3nhmYeTqwXOpHzpdQ6H/noNb83Kwk23AxBKJrXQ2rNsN/jz5UskEGXu/DS5YmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765038777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PzjNVH6a/yr4oKbPgaOL+Oqlnf2dgcUioCmJHzmyXqw=; b=oTcz9rA5NFVqgRKV79GrdDhlw36Nxpi4s6EEWjI6jHSfvZm2fPwml/gfxWLieiIzqdDOOw pOVrXeekXVYNuJ2m9s1G0EOT83xqZu4IUv5Gl53RozurKHuibLdRaxMbXmFH2l7QhZ00bw YjyNGYa1jnZyfMWS/qgyl7m9t/xQI3jHorpoO89W0b0Zx5Po/p/myYgX93lA+jbrwecPEN VkuC5nmIoC1tM2b/3wMOpYLMdWSscS/cZN0ngz6GWtXgS5EB0p+4ugE2gRv5TXGJukbpmI M8be12mIeDV3Od0RXVS2tRXcVRvWMDqF6sTMcXv8fLtWkUxHyHeNt25ImX224A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765038777; a=rsa-sha256; cv=none; b=g25+6hvptZVkH/xsoDRgp1vhDfCt+lWoKrafllADIVsnq4TzQ0dhNxpNHavM2gpKZqYp2H s6MlYNAFrqPeQItfP9ufmDdirFWHAHQOW2admhf334M3Ng6VchwrPENBp8rwrXsxBfPGsm NfUaFJ8BKrOXVsC9qnhCM8y7/ihof541xYhVPFZkpXtFXkuEAoHwZvm4+HisEclI/D+oZu zCqVw0xINp5J0ayw83PA2Nlv0MxF8xr1C2qeCxnYKUz4C3FKwF9xFNkvrT9eBCYlzl/4MM tfpf02b62Mvuj+IpijR1KUCYA6hWzby5186BtZyQxuzVSIZyIlPn0C0Qs1P/UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNv1P2X3Wz141C for ; Sat, 06 Dec 2025 16:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36bc1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 16:32:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 6f4debc004c3 - main - tcp: fix build with RSS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f4debc004c31a2bd846757859e67855ab3d4c8d Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 16:32:57 +0000 Message-Id: <69345ab9.36bc1.21abb56a@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6f4debc004c31a2bd846757859e67855ab3d4c8d commit 6f4debc004c31a2bd846757859e67855ab3d4c8d Author: Gleb Smirnoff AuthorDate: 2025-12-06 16:32:08 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-06 16:32:08 +0000 tcp: fix build with RSS PR: 291439 Fixes: 73fe85e486d297c9c976095854c1c84007e543f0 --- sys/netinet/tcp_syncache.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index eb473dac4dfc..6a3c5a5c9310 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -71,6 +71,7 @@ #include #include #include +#include #include #include #ifdef INET6 @@ -79,6 +80,7 @@ #include #include #include +#include #endif #include #include From nobody Sat Dec 6 19:59:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNzbN5M19z6J3CC for ; Sat, 06 Dec 2025 19: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNzbN21zZz3lc5 for ; Sat, 06 Dec 2025 19: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=1765051152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKCl+mGcBQUhMVlk/05tLcb1DHKHTz15Q7X3um05dRE=; b=vBxP4C/BK8qdRui9ylk/AvdFogvyW7o1nTcpd+zfS7DmwCxtKvR3Un4EVCCEnJW8QZOeR/ pxX1IikhxuQE708fYgYpyPpYyHDrfBA+XfHefX+18ZRDB9tUtDa0ptD11EunHcIryYRVAs rBSIvhgN6thlZf1+EYXxExUaVc5ZpvhXkRp1bgQ+ex/oIPOR6KpmnOIWWf04yifvGVgYdf r/HDTiwYNQGb+4qkxCNfc2Db5Rg7IJ9WXmpfhyEdvNyalUQJlxfPxZYpnTeNsBxU7WTSVX +33zd7ivFnimgW/EJ/fJI7/N3tEN02gcFXrg4cp3q+amhPi6VQEn6ctHeLfE4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765051152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKCl+mGcBQUhMVlk/05tLcb1DHKHTz15Q7X3um05dRE=; b=doIP5bETCnkzVRlVk8LJ+rL/9cv4N17TBG5ndfqJLt+BTg6dOjHHI6lG7UA89ZsBFGZSjo tWoeiyq3NADXUm7vxA702lW5trUIxpwoufvgLX8jGxFITLdBA7WJjGnFvv2z45PurlTFKU +Rd9G8l5IKGwYj2rNRT1J86/ZLvGgerV+uGDlzxdXFqDemTJtnyor03y5fTopePdclatW9 KINSmrt1oWAoCOMGIVhfSRDmhynSJG0e+H+aTFyt2IGwdKuPFgLug3WYReTRlJFsd6c46i 2P37S0enqK4xX8Ru94L+zyG6FhilbAw0ZD0kmwukqdsCVBpBer+LWS8FwzeFzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765051152; a=rsa-sha256; cv=none; b=viNlkSFG/EjEN+de8zpwPn2OAPFV7CL/EOfH/r7M/jx5vzvI3AmmWpN8F1V7tXZSG1sTVz bLssogMOyr65Hqj40TdlcN2qnh8YcbLesUQf6UrRtzLUEnMaCzRXIg9PCGhXEwNJMkJYWi jV+80bbpqfu5ybKIS15K+c37t97XyQjBu71xHTJ5Aifa7swPVL6iig7GAF5pl4gsq60PK/ joKr7w5b2NFFBPWELFpjp1C7TSa86uy4aruHiL4bBSGYOllAcwD1UhxJgXi+JKR0dl6FHU 00W6pTSe2EZ2QGE89o5f4kX/faHtCz9CDjw8GzUN/4Dfv6VCoVvWgW1aGX3MDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNzbN1Wpjz19DL for ; Sat, 06 Dec 2025 19:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c792 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 19:59:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jonathan T. Looney Subject: git: 3f10e5985044 - main - ip6: Add explicit lock order information to catch LOR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jtl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f10e5985044001a68761995474f1100aca648e1 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 19:59:12 +0000 Message-Id: <69348b10.2c792.23204314@gitrepo.freebsd.org> The branch main has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=3f10e5985044001a68761995474f1100aca648e1 commit 3f10e5985044001a68761995474f1100aca648e1 Author: Jonathan T. Looney AuthorDate: 2025-12-05 17:34:31 +0000 Commit: Jonathan T. Looney CommitDate: 2025-12-06 19:58:46 +0000 ip6: Add explicit lock order information to catch LOR Over the past several years, we have had sporadic reports of a lock order reversal between the tcphash lock and the in6_ifaddr_lock. These seems to be hard to reproduce reliably, and the WITNESS backtrace points to code which uses the correct locking order. This commit adds the correct lock order explicitly to help us detect the call stack which uses the incorrect locking order. PR: 289184 Reported by: bz, gbe Reviewed by: bz, glebius Differential Revision: https://reviews.freebsd.org/D54088 --- sys/kern/subr_witness.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index c937f6a82757..abed76315c34 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -566,6 +566,12 @@ static struct witness_order_list_entry order_lists[] = { { "tcp", &lock_class_mtx_sleep }, { "so_snd", &lock_class_mtx_sleep }, { NULL, NULL }, + /* + * IPv6 Addr + */ + { "tcphash", &lock_class_mtx_sleep }, + { "in6_ifaddr_lock", &lock_class_rm }, + { NULL, NULL }, /* * BPF */ From nobody Sun Dec 7 13:07:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dPQQD4gXHz6KQB8 for ; Sun, 07 Dec 2025 13:07: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dPQQD0r6Tz3TN7 for ; Sun, 07 Dec 2025 13:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765112868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVfR9V83VowjSZ+dz8fE56Um+wOvbZeEA98qNcttG1k=; b=quFpM3dwcZ5mE6Pcx7EhJMDWFfszeE6SMcojcFRWdHQEaFks8+hFDrwfWUCIwuwahsNsBZ IYepH00P+HO06UaJeFP9/j4ELBI8wSW7uoAenNCbKDwDs36Rfzqw8nno7d7UgB8amGla43 4p0ehjuIYzqNnT5nQ+/Lw58m/16i19CX1rrxo3xAZrxOW6ChbFpGRessJTnj+awulype8M X2abb8qz6A26if9hqi8lScHgqsnk7vX5hLt/K36Dy3ND2gqUgWC6V4jP5cAa4iZbPimxWJ l+WY3h+dls2KIWpuHR7r/gKs/gZxx2Ey+c2jvGGMnf6Z3IUorMQuRHdoYCQD6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765112868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVfR9V83VowjSZ+dz8fE56Um+wOvbZeEA98qNcttG1k=; b=owugK2bkmWT62d6zZ8PBqLJqLK7TxKPVyaSx9ztUoS01Jd9xPFE7aojAfMMEzcftO4Qh6D /2lpEzyxtUI4jBuOxSxziy+YxNALdclHtnExRAI3h1GSxjzmBLUB+Ild3qbFWhRhijjr8L 3zFZL8/m5Jxy8ReU5250X5F0yp9b6CTLvocganHFRLJwb02aiVgR/2iwY4WT6yPmw6sPHl pulJLoPgdFK0Wz5qii0I0xW+PrgXyJI0kJVLeeecUJuisINBSR0F9ok6SIC8VWkICBKMGU WjQu5g7RQT5kIbPS5MQf6c1qpN5jqzgQVabX+WybM5H+++troQvcFHfUy8EzKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765112868; a=rsa-sha256; cv=none; b=ExrlAGp3DsjPHsz3e2tC2PqOn2URvV5nPjaGYz1ew4sQGImmkiC4IWhliga2Ov0KEq2tDI nC9vl+ByoWmx4Gl78drW5AhDPXuEqvKCbEUMShgSjVG0v2WN/QlHBQvgbEm7SoUB8xvlOb UxVtYTqMcl0DGA5VqU8edcRdXeeWv8pCT09PWCKM2UOlnYdrF/6ev/8Qo4VNE/AC++FaU2 Krtv/Jx6Y3qCxoCcO0S8cK4PwS3nw8OQPfPilZjGzGNXAcwrelL4qq79DLGQVzWFsXimkx isGV+mfFZp2KodNxP+hVk9lXkp9AiXdCZN5wCu3KasiR0TPBppiC0JqafTSZlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dPQQD00hczkYC for ; Sun, 07 Dec 2025 13:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22671 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Dec 2025 13:07:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c51876a10731 - main - libsysdecode: Use consistent include path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c51876a107310984ba3a31b088caebcfd86a9844 Auto-Submitted: auto-generated Date: Sun, 07 Dec 2025 13:07:47 +0000 Message-Id: <69357c23.22671.1761ba04@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c51876a107310984ba3a31b088caebcfd86a9844 commit c51876a107310984ba3a31b088caebcfd86a9844 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-07 13:06:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-07 13:06:41 +0000 libsysdecode: Use consistent include path mkioctls should look at the same set of headers as mktables does. MFC after: 1 week Fixes: 139d114acc7b ("libsysdecode use MKTABLES_INCLUDEDIR") Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D54106 --- lib/libsysdecode/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index 11f45355b8e2..60422d3fc9ef 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -144,7 +144,7 @@ ioctl.c.tmp: .PHONY .endif ioctl.c.tmp: mkioctls .META env CPP="${CPP}" MK_PF="${MK_PF}" \ - /bin/sh ${.CURDIR}/mkioctls ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} > ${.TARGET} + /bin/sh ${.CURDIR}/mkioctls ${MKTABLES_INCLUDEDIR} > ${.TARGET} ioctl.c: ioctl.c.tmp if [ ! -e ${.TARGET} ] || ! cmp -s ${.TARGET} ${.TARGET}.tmp; then \ From nobody Sun Dec 7 23:10:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dPgpB0sLDz6J077 for ; Sun, 07 Dec 2025 23:10: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dPgpB0J4cz3yfD for ; Sun, 07 Dec 2025 23:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765149058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sCVDl62qk5TyXV7tKUw48s88GWfN3u9J368bIyjR1OE=; b=GbhlQuOe0PofQgadTMXfDBNTbWpF97cSFYsGh7RfBbGFpinrzetZxHc0VIaR09QZeFH47H LQPHIxmA/M2IPqZrsTEoMTH0dK/hV7jr5JvkxUQWNMo8ySPfkQxONP8SOLyQHoMMPR4WWS qscjPZF9IJUWX8Xxfwiy5aJC4HKhjtE9BKqj6tJcigQBYY+7tb7N65XGg9cC8TmPkyoUTO u0oSIDTpdsSgzBRFqu/48KuVoIy/4M9ORcagGteakPCp3e2nq48J6gsaYzbsHhTusTtuLe U5DVo6+u42tUjzQczsmFzjdkjVbsLC1kSdapZABQvAysgiEC6aAZneDflNkrYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765149058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sCVDl62qk5TyXV7tKUw48s88GWfN3u9J368bIyjR1OE=; b=JgmEmDdxJG3FSUGIjkZu/wD+u5D56WM51eZdiRQItc8O7EAuUWYNKB69dYbIknjcthF0UF vywun1YA8mbXo3MusEq43h4iY/axX/DXIR9vkKV/klsDfVRLZZDA1KoE6lFuQfrc1MDeEO 6U+B2n/2Q5ggO39i+W7+GLpFJTCdj4Zaj7jwj7/UrGL+XdO957+coqxFjY0hlywZcmGVop rF0yCDaHwin5iPar44ErOEqlUO8pVHtolr0PJKFUS75pwWm0mHo9f7TQDBsz0gMYbLqqX3 ZnecMDZkDlbV/c2fzycc9miXGb5rKEQEbguQL7YAEwWP7+zqCd4jEgk07iO0Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765149058; a=rsa-sha256; cv=none; b=YTAobOi0j5D9PKGJFXLltMQFff8EAQTsh8qcPK4zTm2pgfjf0OXeR4kg76H9kXDJQ+Wixy K8WYgyW0E89dOJP0M1zpCm7UbcaODeO0iFEJQF7w3N3oqkMhZ+nWlKL6qHMAmwC3v2KjKO kpTWz90hnrBbJCCzCQosX4DoOC0MiTHtWu/Sg5pKuDp//BAph0DZqrI58nKFAENprH4nc6 zVamaMBGYAjsUB5KD0q7ghc/IEVE/aZG2eJ6RLk10IkfxaoaeFtR3S0VYbmoUtkso5NxSX y8lxAoIRBv1UvTIzCHpY8bUPdbD9S0u3JaoMqViNf1YFgnx2OShf/C0aktGNwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dPgp971Kbz134G for ; Sun, 07 Dec 2025 23:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ae97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Dec 2025 23:10:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 66e85755595a - main - zfs: merge openzfs/zfs@89f729dcc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66e85755595a451db490d2fe24267d85db4b09c2 Auto-Submitted: auto-generated Date: Sun, 07 Dec 2025 23:10:57 +0000 Message-Id: <69360981.ae97.5ff70e8d@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=66e85755595a451db490d2fe24267d85db4b09c2 commit 66e85755595a451db490d2fe24267d85db4b09c2 Merge: c51876a10731 89f729dcca87 Author: Martin Matuska AuthorDate: 2025-12-07 21:38:13 +0000 Commit: Martin Matuska CommitDate: 2025-12-07 21:38:13 +0000 zfs: merge openzfs/zfs@89f729dcc Notable upstream pull request merges: #17932 1f3444f2b zpool: fix special vdev -v -o conflict #17934 -multiple Remove libuutil #17941 88d012a1d Fix snapshot automount expiry cancellation deadlock #17942 36e4f1888 Fix taskq NULL pointer dereference on timer race #17946 39303feba chksum: run 256K benchmark on demand, preserve chksum_stat_data #17948 -multiple Remove libtpool #17957 e37937f42 ztest: fix broken random call #17960 928eccc5b DDT: Reduce global DDT lock scope during writes #17961 48f33c1ef DDT: Make children writes inherit allocator #17975 7f7d4934c FreeBSD: Fix uninitialized variable error #17980 a5b665df3 DDT: Switch to using wmsums for lookup stats #18004 ffaea0831 FreeBSD: Remove HAVE_INLINE_FLSL use Obtained from: OpenZFS OpenZFS commit: 89f729dcca87425aadfa03d1764e96f285eb658d .../.github/workflows/scripts/qemu-4-build-vm.sh | 2 +- .../.github/workflows/scripts/qemu-test-repo-vm.sh | 18 +- sys/contrib/openzfs/.github/workflows/smatch.yml | 52 + .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.c | 23 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.h | 2 +- sys/contrib/openzfs/cmd/zed/Makefile.am | 3 +- sys/contrib/openzfs/cmd/zed/agents/zfs_diagnosis.c | 77 +- sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 14 +- sys/contrib/openzfs/cmd/zfs/Makefile.am | 3 +- sys/contrib/openzfs/cmd/zfs/zfs_iter.c | 56 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 382 +-- sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 - sys/contrib/openzfs/cmd/zpool/zpool_iter.c | 80 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 104 +- sys/contrib/openzfs/cmd/ztest.c | 2 +- sys/contrib/openzfs/config/deb.am | 19 +- .../openzfs/config/kernel-kmap-atomic-args.m4 | 2 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 2 - sys/contrib/openzfs/contrib/debian/clean | 1 - sys/contrib/openzfs/contrib/debian/control | 24 +- .../openzfs/contrib/debian/openzfs-libuutil3.docs | 2 - .../contrib/debian/openzfs-libuutil3.install.in | 1 - .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 - sys/contrib/openzfs/include/Makefile.am | 6 +- sys/contrib/openzfs/include/libuutil.h | 327 -- sys/contrib/openzfs/include/libuutil_common.h | 36 - sys/contrib/openzfs/include/libuutil_impl.h | 157 - .../openzfs/include/os/freebsd/spl/sys/sysmacros.h | 77 +- .../openzfs/include/os/freebsd/spl/sys/taskq.h | 2 +- .../openzfs/include/os/linux/spl/sys/taskq.h | 2 +- sys/contrib/openzfs/include/sys/ddt.h | 18 + sys/contrib/openzfs/include/thread_pool.h | 56 - sys/contrib/openzfs/lib/Makefile.am | 27 +- sys/contrib/openzfs/lib/libspl/include/sys/taskq.h | 4 +- sys/contrib/openzfs/lib/libspl/include/sys/types.h | 11 + sys/contrib/openzfs/lib/libspl/taskq.c | 19 +- sys/contrib/openzfs/lib/libspl/tunables.c | 12 +- sys/contrib/openzfs/lib/libtpool/Makefile.am | 11 - sys/contrib/openzfs/lib/libtpool/thread_pool.c | 612 ---- .../openzfs/lib/libtpool/thread_pool_impl.h | 94 - sys/contrib/openzfs/lib/libuutil/Makefile.am | 28 - sys/contrib/openzfs/lib/libuutil/libuutil.abi | 3360 -------------------- sys/contrib/openzfs/lib/libuutil/libuutil.suppr | 2 - sys/contrib/openzfs/lib/libuutil/uu_alloc.c | 136 - sys/contrib/openzfs/lib/libuutil/uu_avl.c | 569 ---- sys/contrib/openzfs/lib/libuutil/uu_ident.c | 123 - sys/contrib/openzfs/lib/libuutil/uu_list.c | 723 ----- sys/contrib/openzfs/lib/libuutil/uu_misc.c | 255 -- sys/contrib/openzfs/lib/libuutil/uu_string.c | 55 - sys/contrib/openzfs/lib/libzfs/Makefile.am | 3 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 1236 +++---- sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c | 129 +- sys/contrib/openzfs/lib/libzfs/libzfs_config.c | 71 +- sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 21 +- .../openzfs/lib/libzfs/os/linux/libzfs_mount_os.c | 1 - .../openzfs/lib/libzfs_core/libzfs_core.abi | 16 +- sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 - .../lib/libzutil/os/freebsd/zutil_import_os.c | 1 - .../lib/libzutil/os/linux/zutil_import_os.c | 1 - sys/contrib/openzfs/lib/libzutil/zutil_import.c | 13 +- sys/contrib/openzfs/module/Kbuild.in | 2 +- .../openzfs/module/os/freebsd/spl/spl_taskq.c | 13 +- .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 2 +- .../openzfs/module/os/linux/spl/spl-taskq.c | 58 +- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 50 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_dir.c | 3 +- sys/contrib/openzfs/module/zfs/ddt.c | 94 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 3 +- sys/contrib/openzfs/module/zfs/spa.c | 6 +- sys/contrib/openzfs/module/zfs/zfs_chksum.c | 24 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 3 +- sys/contrib/openzfs/module/zfs/zio.c | 126 +- sys/contrib/openzfs/rpm/generic/zfs.spec.in | 29 - .../events/slow_vdev_degraded_sit_out.ksh | 26 +- .../tests/functional/raidz/raidz_001_neg.ksh | 2 +- sys/contrib/openzfs/udev/zvol_id.c | 2 +- 78 files changed, 1244 insertions(+), 8291 deletions(-) diff --cc sys/contrib/openzfs/.github/workflows/smatch.yml index 000000000000,ac6454244f93..ac6454244f93 mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/workflows/smatch.yml +++ b/sys/contrib/openzfs/.github/workflows/smatch.yml From nobody Sun Dec 7 23:10:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dPgpC3pLnz6Hyng for ; Sun, 07 Dec 2025 23:10: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dPgpC0zbfz3yHR for ; Sun, 07 Dec 2025 23:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765149059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mPs8zrKq/4sIUAaZsFBqprLbJKbEYsrYT6KV3yXAz70=; b=CT+T5/T1imv5Mjcc9EGLflR1aj3KgHI3ZJehmdwQ3K1Bz0xeXGX+ePjou61Q6B298M5Cp5 oZ9pq0nBR/KesEk6ZYlm1cWxaAMm6xAOtmttgNw1qv4V3nz5YXlfdvzm2fBgG5uP55Kfps KI5HotP7H4K1t+KfYsSMd3uLulgGbNLhxg83KSiKwxq55m6mbE3dQVFNsZpboQ7bMOayGj Izu8b45IS0k3+l2I4TLmt2sedKyTKmrLj2OlAVw0Nua6q4vPeDEFEp/qdQHFKVc3EJOJvF 8va0Dq8KnuYlTimzt+HadiS/pUaLNESmXuqObxawLjNN56axOkdxfcuDzNedrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765149059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mPs8zrKq/4sIUAaZsFBqprLbJKbEYsrYT6KV3yXAz70=; b=qGJAY17tMNXmejZyKGGgCROzE8KLvWARUZ70Zt24XnJ3Qtna/nCGUTSZNRPu6n9eDw263U 6v4nieWyEQkFX8I3eEafyGZcRuCiFNmWYLzfBkA/xDLMrMo75c9slxa1qKeUlosXuIy+iU XH0XemELVdKyl01L7yDgQDRKKgXUqzu7/uTqE4XdPFfbl4Z5uoA+DhFX0yeT2996ayAktK DWNpESPzjOlJiSI4wQLswex+oE4v/d8H9xVp4Dv7OJWkR+SFuynXUB+LCU7BI6to52bvVI 2tCaIDxszpLkbkuxVqSSiL/vhCzeMjcE/CnFgKWLMN3ZJpWv+m8ZTJgalENqlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765149059; a=rsa-sha256; cv=none; b=bbSDeNda5llF1LC0eN3dgzIrcq6fGc51074zHqu/RXb40npl50+/7ICRGTB6WloSYEOIYm kDyGYGPCfiJiUyrKQi7onl3JvU8xWjcLwgQuFhh3lm6OFzVLxBdmBMkIHgeuM0N/RWJxpY wuvHIJpad5AL4MxmXgxsoQt0xM5q+MPyM0dC5IQkZ0NLS+nwBTgpvXzS3yL3BzFUqJacM6 I+8tXaZkXaV/nrulETFZXa4i5eCgNi1PCHRJDf8ASeMI/7WoRLtMbMQdZAIbLzDYRK4j87 LuLEkgscSOn+eBh22xOqcsKrwhRiEvKdb3mw787uVU2iJQHwIpKDO302cZcKVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dPgpC0XsMz134H for ; Sun, 07 Dec 2025 23:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id adf3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Dec 2025 23:10:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 8b78d412aec7 - main - zfs: world changes after 89f729dcc merge List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b78d412aec7f9171ecc2e1cd8aea07b19b4f600 Auto-Submitted: auto-generated Date: Sun, 07 Dec 2025 23:10:59 +0000 Message-Id: <69360983.adf3.7d6e4650@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=8b78d412aec7f9171ecc2e1cd8aea07b19b4f600 commit 8b78d412aec7f9171ecc2e1cd8aea07b19b4f600 Author: Martin Matuska AuthorDate: 2025-12-07 22:09:12 +0000 Commit: Martin Matuska CommitDate: 2025-12-07 22:09:12 +0000 zfs: world changes after 89f729dcc merge Remove, unbind and obsolete libuutil and libtpool Update zfs_configh and zfs_gitrev.h --- Makefile.inc1 | 11 +--- ObsoleteFiles.inc | 4 ++ cddl/lib/Makefile | 10 +-- cddl/lib/libtpool/Makefile | 32 ---------- cddl/lib/libtpool/Makefile.depend | 16 ----- cddl/lib/libtpool/tests/Makefile | 11 ---- cddl/lib/libtpool/tests/libtpool_test.c | 82 ------------------------- cddl/lib/libuutil/Makefile | 26 -------- cddl/lib/libuutil/Makefile.depend | 17 ----- cddl/lib/libzfs/Makefile | 1 - cddl/lib/libzfs/Makefile.depend | 1 - cddl/lib/libzutil/Makefile | 2 +- cddl/lib/libzutil/Makefile.depend | 1 - cddl/lib/pam_zfs_key/Makefile | 2 +- cddl/sbin/zfs/Makefile | 2 +- cddl/sbin/zfs/Makefile.depend | 2 - cddl/sbin/zpool/Makefile | 2 +- cddl/sbin/zpool/Makefile.depend | 2 - cddl/usr.bin/zinject/Makefile | 2 +- cddl/usr.bin/zinject/Makefile.depend | 1 - cddl/usr.bin/zstream/Makefile | 2 +- cddl/usr.bin/ztest/Makefile | 2 +- cddl/usr.bin/ztest/Makefile.depend | 1 - cddl/usr.libexec/zpool_influxdb/Makefile.depend | 1 - cddl/usr.sbin/zdb/Makefile | 2 +- cddl/usr.sbin/zdb/Makefile.depend | 1 - cddl/usr.sbin/zfsd/Makefile.common | 2 +- cddl/usr.sbin/zfsd/Makefile.depend | 1 - rescue/rescue/Makefile | 2 +- share/mk/bsd.libnames.mk | 2 - share/mk/src.libnames.mk | 12 +--- sys/modules/zfs/zfs_config.h | 4 +- targets/pseudo/userland/cddl/Makefile.depend | 1 - 33 files changed, 24 insertions(+), 236 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index cc1901a1e950..9518d4034afc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3316,12 +3316,10 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libgeom \ ${_lib_librt} \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ - ${_cddl_lib_libuutil} \ ${_cddl_lib_libavl} \ ${_cddl_lib_libicp} \ ${_cddl_lib_libicp_rescue} \ ${_cddl_lib_libspl} \ - ${_cddl_lib_libtpool} \ ${_cddl_lib_libzfs_core} ${_cddl_lib_libzfs} \ ${_cddl_lib_libzutil} \ ${_cddl_lib_libctf} ${_cddl_lib_libzfsbootenv} \ @@ -3394,32 +3392,27 @@ lib/libxo__L: lib/libutil__L _cddl_lib_libumem= cddl/lib/libumem _cddl_lib_libnvpair= cddl/lib/libnvpair _cddl_lib_libavl= cddl/lib/libavl -_cddl_lib_libuutil= cddl/lib/libuutil _cddl_lib_libspl= cddl/lib/libspl cddl/lib/libavl__L: cddl/lib/libspl__L cddl/lib/libnvpair__L: cddl/lib/libspl__L -cddl/lib/libuutil__L: cddl/lib/libavl__L cddl/lib/libspl__L .if ${MK_ZFS} != "no" _lib_librt= lib/librt _cddl_lib_libicp= cddl/lib/libicp _cddl_lib_libicp_rescue= cddl/lib/libicp_rescue -_cddl_lib_libtpool= cddl/lib/libtpool _cddl_lib_libzutil= cddl/lib/libzutil _cddl_lib_libzfs_core= cddl/lib/libzfs_core _cddl_lib_libzfs= cddl/lib/libzfs _cddl_lib_libzfsbootenv= cddl/lib/libzfsbootenv -cddl/lib/libtpool__L: cddl/lib/libspl__L - -cddl/lib/libzutil__L: cddl/lib/libavl__L lib/libgeom__L lib/msun__L cddl/lib/libtpool__L +cddl/lib/libzutil__L: cddl/lib/libavl__L lib/libgeom__L lib/msun__L cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L cddl/lib/libspl__L cddl/lib/libzutil__L cddl/lib/libzfs__L: cddl/lib/libzfs_core__L lib/msun__L lib/libutil__L lib/librt__L cddl/lib/libzfs__L: lib/libthr__L lib/libmd__L lib/libz__L cddl/lib/libumem__L -cddl/lib/libzfs__L: cddl/lib/libuutil__L cddl/lib/libavl__L lib/libgeom__L +cddl/lib/libzfs__L: cddl/lib/libavl__L lib/libgeom__L cddl/lib/libzfs__L: cddl/lib/libnvpair__L cddl/lib/libzutil__L cddl/lib/libzfs__L: secure/lib/libcrypto__L diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index e42fcb7d8f84..96af7d6205b5 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20251207: removed libuutil and libtpool +OLD_LIBS+= lib/libuutil.so.2 +OLD_LIBS+= lib/libtpool.so.2 + # 20251204: zpfind.9 alias to pfind.9 removed OLD_FILES+=usr/share/man/man9/zpfind.9 diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index 892798be347d..19f0cf4385e2 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -16,9 +16,7 @@ SUBDIR.${MK_ZFS}+= \ libicp \ libicp_rescue \ libnvpair \ - libtpool \ libumem \ - libuutil \ libzdb \ libzfs \ libzfs_core \ @@ -32,14 +30,12 @@ SUBDIR_DEPEND_libavl= libspl SUBDIR_DEPEND_libctf= libspl SUBDIR_DEPEND_libdtrace= libctf SUBDIR_DEPEND_libnvpair= libspl -SUBDIR_DEPEND_libtpool= libspl -SUBDIR_DEPEND_libuutil= libavl libspl SUBDIR_DEPEND_libzfs_core= libnvpair libspl libzutil -SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core libzutil +SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libzfs_core libzutil SUBDIR_DEPEND_libzpool= libavl libnvpair libumem libicp -SUBDIR_DEPEND_libzutil= libavl libtpool +SUBDIR_DEPEND_libzutil= libavl SUBDIR_DEPEND_libzfsbootenv= libzfs libnvpair -SUBDIR_DEPEND_pam_zfs_key= libnvpair libuutil libzfs libzfs_core +SUBDIR_DEPEND_pam_zfs_key= libnvpair libzfs libzfs_core SUBDIR_PARALLEL= diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile deleted file mode 100644 index 1ebfc52f5be9..000000000000 --- a/cddl/lib/libtpool/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -.PATH: ${ZFSTOP}/lib/libtpool -.PATH: ${ZFSTOP}/include - -PACKAGE= zfs -LIB_PACKAGE= - -LIB= tpool -SHLIBDIR?= /lib -LIBADD= spl - -INCS= thread_pool_impl.h -SRCS= thread_pool.c - -WARNS?= 2 -CSTD= c99 -CFLAGS+= -DIN_BASE -CFLAGS+= -I${ZFSTOP}/include -CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ -CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys -CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${ZFSTOP}/module/icp/include -CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID -CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h - -.include - -HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests - -.include diff --git a/cddl/lib/libtpool/Makefile.depend b/cddl/lib/libtpool/Makefile.depend deleted file mode 100644 index 409c3c86cc20..000000000000 --- a/cddl/lib/libtpool/Makefile.depend +++ /dev/null @@ -1,16 +0,0 @@ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - cddl/lib/libspl \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/cddl/lib/libtpool/tests/Makefile b/cddl/lib/libtpool/tests/Makefile deleted file mode 100644 index 72a82b6afa59..000000000000 --- a/cddl/lib/libtpool/tests/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -ATF_TESTS_C+= libtpool_test - -TEST_METADATA+= timeout="10" - -CFLAGS+= -I${ZFSTOP}/include \ - -I${ZFSTOP}/lib/libspl/include - -LIBADD+= pthread tpool - -.include "${SRCTOP}/cddl/Makefile.inc" -.include diff --git a/cddl/lib/libtpool/tests/libtpool_test.c b/cddl/lib/libtpool/tests/libtpool_test.c deleted file mode 100644 index 42bce269cb23..000000000000 --- a/cddl/lib/libtpool/tests/libtpool_test.c +++ /dev/null @@ -1,82 +0,0 @@ -#include -#include -#include -#include - -#include - -#include - -static void -tp_delay(void *arg) -{ - pthread_barrier_t *barrier = arg; - int r; - - /* Block this task until all thread pool workers have been created. */ - r = pthread_barrier_wait(barrier); - ATF_REQUIRE_MSG(r == 0 || r == PTHREAD_BARRIER_SERIAL_THREAD, - "pthread_barrier_wait failed: %s", strerror(r)); -} - -/* - * NB: we could reduce the test's resource cost by using rctl(4). But that - * isn't enabled by default. And even with a thread limit of 1500, it takes < - * 0.1s to run on my machine. So I don't think it's worth optimizing for the - * case where rctl is available. - */ -ATF_TC(complete_exhaustion); -ATF_TC_HEAD(complete_exhaustion, tc) -{ - atf_tc_set_md_var(tc, "descr", - "A thread pool should fail to schedule tasks if it is completely impossible to spawn any threads."); -} - -ATF_TC_BODY(complete_exhaustion, tc) -{ - pthread_barrier_t barrier; - tpool_t *tp0, *tp1; - size_t len; - int max_threads_per_proc = 0; - int nworkers; - int r, i; - - len = sizeof(max_threads_per_proc); - r = sysctlbyname("kern.threads.max_threads_per_proc", - &max_threads_per_proc, &len, NULL, 0); - ATF_REQUIRE_EQ_MSG(r, 0, "sysctlbyname: %s", strerror(errno)); - nworkers = max_threads_per_proc - 1; - pthread_barrier_init(&barrier, NULL, max_threads_per_proc); - - /* - * Create the first thread pool and spawn the maximum allowed number of - * processes. - */ - tp0 = tpool_create(nworkers, nworkers, 1, NULL); - ATF_REQUIRE(tp0 != NULL); - for (i = 0; i < nworkers; i++) { - ATF_REQUIRE_EQ(tpool_dispatch(tp0, tp_delay, &barrier), 0); - } - - /* - * Now create a second thread pool. Unable to create new threads, the - * dispatch function should return an error. - */ - tp1 = tpool_create(nworkers, 2 * nworkers, 1, NULL); - ATF_REQUIRE(tp1 != NULL); - ATF_REQUIRE_EQ(tpool_dispatch(tp1, tp_delay, NULL), -1); - - /* Cleanup */ - r = pthread_barrier_wait(&barrier); - ATF_REQUIRE_MSG(r == 0 || r == PTHREAD_BARRIER_SERIAL_THREAD, - "pthread_barrier_wait failed: %s", strerror(r)); - tpool_wait(tp1); - tpool_wait(tp0); -} - -ATF_TP_ADD_TCS(tp) -{ - ATF_TP_ADD_TC(tp, complete_exhaustion); - - return (atf_no_error()); -} diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile deleted file mode 100644 index ca5a71d811f7..000000000000 --- a/cddl/lib/libuutil/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -.PATH: ${ZFSTOP}/lib/libuutil - -PACKAGE= zfs -LIB_PACKAGE= - -LIB= uutil -SRCS=\ - uu_alloc.c \ - uu_avl.c \ - uu_ident.c \ - uu_list.c \ - uu_misc.c \ - uu_string.c - -WARNS?= 2 -CFLAGS+= -DIN_BASE -CFLAGS+= -I${ZFSTOP}/include -CFLAGS+= -I${ZFSTOP}/lib/libspl/include/ -CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys -CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h - -LIBADD= avl spl - -.include diff --git a/cddl/lib/libuutil/Makefile.depend b/cddl/lib/libuutil/Makefile.depend deleted file mode 100644 index 808980b1879e..000000000000 --- a/cddl/lib/libuutil/Makefile.depend +++ /dev/null @@ -1,17 +0,0 @@ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - cddl/lib/libavl \ - cddl/lib/libspl \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index ed0c240b1113..a034118a6f5b 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -23,7 +23,6 @@ LIBADD= \ rt \ umem \ util \ - uutil \ z \ zfs_core \ zutil diff --git a/cddl/lib/libzfs/Makefile.depend b/cddl/lib/libzfs/Makefile.depend index 1fead4b4f29d..2ac18ce130ac 100644 --- a/cddl/lib/libzfs/Makefile.depend +++ b/cddl/lib/libzfs/Makefile.depend @@ -4,7 +4,6 @@ DIRDEPS = \ cddl/lib/libavl \ cddl/lib/libnvpair \ cddl/lib/libumem \ - cddl/lib/libuutil \ cddl/lib/libzfs_core \ cddl/lib/libzutil \ include \ diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile index 952ebda889b2..93b0ffdb6fac 100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -6,7 +6,7 @@ PACKAGE= zfs LIB_PACKAGE= LIB= zutil -LIBADD= avl geom m tpool +LIBADD= avl geom m INCS = zutil_import.h diff --git a/cddl/lib/libzutil/Makefile.depend b/cddl/lib/libzutil/Makefile.depend index ddad58a70480..1633aabc89f0 100644 --- a/cddl/lib/libzutil/Makefile.depend +++ b/cddl/lib/libzutil/Makefile.depend @@ -2,7 +2,6 @@ DIRDEPS = \ cddl/lib/libavl \ - cddl/lib/libtpool \ include \ include/xlocale \ lib/${CSU_DIR} \ diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile index 345321b5926d..d4be8090b287 100644 --- a/cddl/lib/pam_zfs_key/Makefile +++ b/cddl/lib/pam_zfs_key/Makefile @@ -6,7 +6,7 @@ LIB= pam_zfs_key SHLIBDIR?= /usr/lib -LIBADD= zfs zfs_core nvpair uutil crypto +LIBADD= zfs zfs_core nvpair crypto SRCS= pam_zfs_key.c diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index 3b9abe4446e8..32d26de952f8 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -71,7 +71,7 @@ CFLAGS+= \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ -I${SRCTOP}/sys/modules/zfs -LIBADD= jail avl nvpair geom uutil zfs_core spl tpool zutil zfs m crypto +LIBADD= jail avl nvpair geom zfs_core spl zutil zfs m crypto LDADD+= -pthread .include diff --git a/cddl/sbin/zfs/Makefile.depend b/cddl/sbin/zfs/Makefile.depend index 41b9cb996621..4bc4ed382284 100644 --- a/cddl/sbin/zfs/Makefile.depend +++ b/cddl/sbin/zfs/Makefile.depend @@ -4,8 +4,6 @@ DIRDEPS = \ cddl/lib/libavl \ cddl/lib/libnvpair \ cddl/lib/libspl \ - cddl/lib/libtpool \ - cddl/lib/libuutil \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ cddl/lib/libzutil \ diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index e2d8bf61e75b..2f46546da9a2 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -75,6 +75,6 @@ CFLAGS+= \ -DSYSCONFDIR=\"/etc\" \ -DPKGDATADIR=\"/usr/share/zfs\" -LIBADD= geom nvpair uutil zfs zutil avl spl tpool zfs_core m +LIBADD= geom nvpair zfs zutil avl spl zfs_core m LDADD+= -pthread .include diff --git a/cddl/sbin/zpool/Makefile.depend b/cddl/sbin/zpool/Makefile.depend index 117ee30093fd..f51363d29398 100644 --- a/cddl/sbin/zpool/Makefile.depend +++ b/cddl/sbin/zpool/Makefile.depend @@ -4,8 +4,6 @@ DIRDEPS = \ cddl/lib/libavl \ cddl/lib/libnvpair \ cddl/lib/libspl \ - cddl/lib/libtpool \ - cddl/lib/libuutil \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ cddl/lib/libzutil \ diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile index cd22feda937a..30be6a90ad7b 100644 --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -21,6 +21,6 @@ CFLAGS+= \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool pthread +LIBADD= geom m nvpair umem avl spl zfs_core zfs zutil zpool pthread .include diff --git a/cddl/usr.bin/zinject/Makefile.depend b/cddl/usr.bin/zinject/Makefile.depend index c36e0e5ad2e7..f78d076ce0d3 100644 --- a/cddl/usr.bin/zinject/Makefile.depend +++ b/cddl/usr.bin/zinject/Makefile.depend @@ -5,7 +5,6 @@ DIRDEPS = \ cddl/lib/libnvpair \ cddl/lib/libspl \ cddl/lib/libumem \ - cddl/lib/libuutil \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ cddl/lib/libzpool \ diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile index d3371101f6dc..f0a11383045c 100644 --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -31,6 +31,6 @@ CFLAGS+= \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool pthread +LIBADD= geom m nvpair umem avl spl zfs_core zfs zutil zpool pthread .include diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index 192c0222377a..71b8c1705c4f 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -20,7 +20,7 @@ CFLAGS+= \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -LIBADD= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp +LIBADD= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs icp CSTD= c99 diff --git a/cddl/usr.bin/ztest/Makefile.depend b/cddl/usr.bin/ztest/Makefile.depend index dd387951fe20..0fbcc239f881 100644 --- a/cddl/usr.bin/ztest/Makefile.depend +++ b/cddl/usr.bin/ztest/Makefile.depend @@ -6,7 +6,6 @@ DIRDEPS = \ cddl/lib/libnvpair \ cddl/lib/libspl \ cddl/lib/libumem \ - cddl/lib/libuutil \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ cddl/lib/libzpool \ diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile.depend b/cddl/usr.libexec/zpool_influxdb/Makefile.depend index 50b043094969..69161b991f7d 100644 --- a/cddl/usr.libexec/zpool_influxdb/Makefile.depend +++ b/cddl/usr.libexec/zpool_influxdb/Makefile.depend @@ -4,7 +4,6 @@ DIRDEPS = \ cddl/lib/libavl \ cddl/lib/libnvpair \ cddl/lib/libumem \ - cddl/lib/libuutil \ cddl/lib/libzfs \ cddl/lib/libzfs_core \ gnu/lib/csu \ diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index 6707d8fdaae7..fa49271dc760 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -21,7 +21,7 @@ CFLAGS+= \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID -LIBADD= nvpair umem uutil zdb zfs_core zfs spl avl zutil zpool crypto pthread +LIBADD= nvpair umem zdb zfs_core zfs spl avl zutil zpool crypto pthread CFLAGS.gcc+= -fms-extensions # Since there are many asserts in this program, it makes no sense to compile diff --git a/cddl/usr.sbin/zdb/Makefile.depend b/cddl/usr.sbin/zdb/Makefile.depend index d9ae0ff3c82e..d4e222e186ed 100644 --- a/cddl/usr.sbin/zdb/Makefile.depend +++ b/cddl/usr.sbin/zdb/Makefile.depend @@ -5,7 +5,6 @@ DIRDEPS = \ cddl/lib/libnvpair \ cddl/lib/libspl \ cddl/lib/libumem \ - cddl/lib/libuutil \ cddl/lib/libzfs \ cddl/lib/libzpool \ cddl/lib/libzutil \ diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common index c610a3bf3e5b..1bade90d140f 100644 --- a/cddl/usr.sbin/zfsd/Makefile.common +++ b/cddl/usr.sbin/zfsd/Makefile.common @@ -25,7 +25,7 @@ CFLAGS+= -I${SRCTOP}/cddl/usr.sbin CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -DHAVE_EXECVPE -LIBADD+= devdctl zfs util geom bsdxml sbuf nvpair avl uutil zutil +LIBADD+= devdctl zfs util geom bsdxml sbuf nvpair avl zutil cscope: find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \ diff --git a/cddl/usr.sbin/zfsd/Makefile.depend b/cddl/usr.sbin/zfsd/Makefile.depend index 4b9049efecdc..64528ed3f4cb 100644 --- a/cddl/usr.sbin/zfsd/Makefile.depend +++ b/cddl/usr.sbin/zfsd/Makefile.depend @@ -3,7 +3,6 @@ DIRDEPS = \ cddl/lib/libavl \ cddl/lib/libnvpair \ - cddl/lib/libuutil \ cddl/lib/libzfs \ cddl/lib/libzutil \ include \ diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 797daf3d2f14..2ac475cca10c 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -145,7 +145,7 @@ CRUNCH_PROGS_usr.sbin+= zdb CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma CRUNCH_LIBS_camcontrol+= ${LIBNVMF} ${LIBNV} .if ${MK_ZFS} != "no" -CRUNCH_LIBS+= -lavl -lpthread -luutil -lumem -ltpool -lspl -lrt +CRUNCH_LIBS+= -lavl -lpthread -lumem -lspl -lrt CRUNCH_LIBS_zfs+= ${LIBBE} \ ${LIBZPOOL} \ ${LIBZFS} \ diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 955e3c4ebdef..9470e95c3036 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -163,7 +163,6 @@ LIBTERMCAP?= ${LIBDESTDIR}${LIBDIR_BASE}/libtermcap.a LIBTERMCAPW?= ${LIBDESTDIR}${LIBDIR_BASE}/libtermcapw.a LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP" LIBTINFOW= ${LIBDESTDIR}${LIBDIR_BASE}/libtinfow.a -LIBTPOOL?= ${LIBDESTDIR}${LIBDIR_BASE}/libtpool.a LIBUFS?= ${LIBDESTDIR}${LIBDIR_BASE}/libufs.a LIBUGIDFW?= ${LIBDESTDIR}${LIBDIR_BASE}/libugidfw.a LIBULOG?= ${LIBDESTDIR}${LIBDIR_BASE}/libulog.a @@ -171,7 +170,6 @@ LIBUMEM?= ${LIBDESTDIR}${LIBDIR_BASE}/libumem.a LIBUSB?= ${LIBDESTDIR}${LIBDIR_BASE}/libusb.a LIBUSBHID?= ${LIBDESTDIR}${LIBDIR_BASE}/libusbhid.a LIBUTIL?= ${LIBDESTDIR}${LIBDIR_BASE}/libutil.a -LIBUUTIL?= ${LIBDESTDIR}${LIBDIR_BASE}/libuutil.a LIBUVMEM?= ${LIBDESTDIR}${LIBDIR_BASE}/libuvmem.a LIBVERTO?= ${LIBDESTDIR}${LIBDIR_BASE}/libverto.a LIBVGL?= ${LIBDESTDIR}${LIBDIR_BASE}/libvgl.a diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 125fe2242bd5..df5fdc544959 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -229,7 +229,6 @@ _LIBRARIES= \ tacplus \ termcapw \ tinfow \ - tpool \ ufs \ ugidfw \ ulog \ @@ -238,7 +237,6 @@ _LIBRARIES= \ usbhid \ util \ uvmem \ - uutil \ verto \ vmmapi \ wind \ @@ -454,7 +452,7 @@ _DP_opencsd= cxxrt _DP_ctf= spl z _DP_dtrace= ctf elf proc pthread rtld_db xo _DP_xo= util -_DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp +_DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs icp # The libc dependencies are not strictly needed but are defined to make the # assert happy. _DP_c= compiler_rt sys @@ -491,15 +489,13 @@ _DP_smb= kiconv _DP_ulog= md _DP_fifolog= z _DP_ipf= kvm -_DP_tpool= spl -_DP_uutil= avl spl _DP_uvmem= pthread -_DP_zfs= md pthread rt umem util uutil m avl bsdxml crypto geom nvpair \ +_DP_zfs= md pthread rt umem util m avl bsdxml crypto geom nvpair \ z zfs_core zutil _DP_zfsbootenv= zfs nvpair _DP_zfs_core= nvpair spl zutil _DP_zpool= md pthread z icp spl nvpair avl umem -_DP_zutil= avl geom m tpool +_DP_zutil= avl geom m _DP_be= zfs spl nvpair zfsbootenv _DP_netmap= _DP_ifconfig= m @@ -787,7 +783,6 @@ LIBICP_RESCUE?= ${LIBICP_RESCUEDIR}/libicp_rescue${PIE_SUFFIX}.a LIBNVPAIRDIR= ${_LIB_OBJTOP}/cddl/lib/libnvpair LIBNVPAIR?= ${LIBNVPAIRDIR}/libnvpair${PIE_SUFFIX}.a LIBUMEMDIR= ${_LIB_OBJTOP}/cddl/lib/libumem -LIBUUTILDIR= ${_LIB_OBJTOP}/cddl/lib/libuutil LIBZDBDIR= ${_LIB_OBJTOP}/cddl/lib/libzdb LIBZDB?= ${LIBZDBDIR}/libzdb${PIE_SUFFIX}.a LIBZFSDIR= ${_LIB_OBJTOP}/cddl/lib/libzfs @@ -800,7 +795,6 @@ LIBZPOOLDIR= ${_LIB_OBJTOP}/cddl/lib/libzpool LIBZPOOL?= ${LIBZPOOLDIR}/libzpool${PIE_SUFFIX}.a LIBZUTILDIR= ${_LIB_OBJTOP}/cddl/lib/libzutil LIBZUTIL?= ${LIBZUTILDIR}/libzutil${PIE_SUFFIX}.a -LIBTPOOLDIR= ${_LIB_OBJTOP}/cddl/lib/libtpool # OFED support LIBCXGB4DIR= ${_LIB_OBJTOP}/lib/ofed/libcxgb4 diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index f012910f58e7..db7672000d8b 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -856,7 +856,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.99-220-FreeBSD_ge63d026b9" +#define ZFS_META_ALIAS "zfs-2.4.99-248-FreeBSD_g89f729dcc" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -886,7 +886,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "220-FreeBSD_ge63d026b9" +#define ZFS_META_RELEASE "248-FreeBSD_g89f729dcc" /* Define the project version. */ #define ZFS_META_VERSION "2.4.99" diff --git a/targets/pseudo/userland/cddl/Makefile.depend b/targets/pseudo/userland/cddl/Makefile.depend index 85d8f2a3f462..e65f682de7cf 100644 --- a/targets/pseudo/userland/cddl/Makefile.depend +++ b/targets/pseudo/userland/cddl/Makefile.depend @@ -12,7 +12,6 @@ DIRDEPS = \ cddl/lib/libdtrace \ cddl/lib/libnvpair \ cddl/lib/libumem \ - cddl/lib/libuutil \ cddl/usr.bin/ctfconvert \ cddl/usr.bin/ctfdump \ cddl/usr.bin/ctfmerge \