From nobody Tue Aug 01 22:26:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RFqTQ1Tdhz4pwpL; Tue, 1 Aug 2023 22:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RFqSz2Szcz3hXY; Tue, 1 Aug 2023 22:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uglN0a4of9G9dUJOkv9w86BWxwd5ZSV75DYnon97YuQ=; b=o7mvuMn7uZARhTCXqzkslfrftAirGUPf1A0+n+0KG7UijQgF1VEcpZS2wbREtZ4ciPa0Vf ykERS70IiDFrlRnfRFKps4UzV/oDO7xQUPMwfRyKJjfr2Uhc20+E5Cj20lNbw3nDqqFeTm ccwOk4Pj5ml5BlUSacbXJBMKCTEEFfcNVpId+Plg3Emo272kUVIPBUQ+WJzG9d+oWQS3s7 ZZZtzB2dohxKOjLn5vHBPlwH5c7UJbgS7ezJlh75cw0l344nK01/hUuqeA48Y/GO1woDmD XUEuZ+wgNDA7SIegmJ5LrtKY2SD+WuPkoycD3Bl417fJdJDzYIQDtsZHRr1s/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690928771; a=rsa-sha256; cv=none; b=Fy0UVuLflev/1UasY5NO0/O9W3K/aW3K0yG5SgilcijAbaIAC7f0CNrD452erZpzw7HWOU y+xi7ZVt0ohiV1oMW7F3mNue5GYEMKhU4TXlupvEYevWPiBAGswiGUHXw+hFnLBY2nI/gm PN6EOuOkTNu6qsUu76xhJnvn4yDW/mHL+KDyGt6KN+WobD2faHu//vxSA902kqy7euBaE6 zLBKf/F4Dh4c1rEIGn1L958g1LXyiPqJWlImJ6gtAfIH3iuU+RkgYBTCGAT0XDY+GfwLsZ iGn2TC6P8B2/Q4dTHi3gZM1nnf6Y9d79c12KAnE7Rgo3pAuXEd6a/ZnXjo3Tbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690928771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uglN0a4of9G9dUJOkv9w86BWxwd5ZSV75DYnon97YuQ=; b=gbS4SaJEN5rk/G0Wp08WtV0WeQ0GJdCY1IG9CpXcjzP658xsMIOyRbTCWF3Y0HNP1iTwMI DFOOyr8gDUZ9PwoLLnEceDerNcnTY4ZwB9ymq1QazquNncK0q+/FooQysCwWJDB5psxkEC se84hpuIuOjTIbHE8W+LB542KqSF22gRe6Qm9pdqOfIfeIi2YNAayyKzwudvrUu+6IxHgi f6Vw/z3P0tX4QYrCJk1AGmxfQKyarGRjbR3+K93XQFLGW2bB1sEUFoAXcndEnZU59j7fU2 GTyDq/CJN6fNsP7WHnb6Lo9vp2vVcDGaWnOfOu1OH5AeaJgtwUiDWK+SJIYzIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RFqSz1HjZzvd8; Tue, 1 Aug 2023 22:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371MQBKC045628; Tue, 1 Aug 2023 22:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371MQBu6045627; Tue, 1 Aug 2023 22:26:11 GMT (envelope-from git) Date: Tue, 1 Aug 2023 22:26:11 GMT Message-Id: <202308012226.371MQBu6045627@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b82711764cd9 - main - cam_xpt: Remove fallbacks for non-sbuf protocol methods List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: b82711764cd90e008335dc59280f64820a32cc95 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b82711764cd90e008335dc59280f64820a32cc95 commit b82711764cd90e008335dc59280f64820a32cc95 Author: John Baldwin AuthorDate: 2023-08-01 22:24:10 +0000 Commit: John Baldwin CommitDate: 2023-08-01 22:24:10 +0000 cam_xpt: Remove fallbacks for non-sbuf protocol methods This includes removing the kern.cam.announce_nosbuf sysctl. Reviewed by: mav, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41262 --- sys/cam/cam_xpt.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 61d24c120841..e7248cf76d19 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -110,7 +110,6 @@ struct xpt_softc { TAILQ_HEAD(, ccb_hdr) ccb_scanq; int buses_to_config; int buses_config_done; - int announce_nosbuf; /* * Registered buses @@ -168,8 +167,6 @@ SYSCTL_INT(_kern_cam, OID_AUTO, boot_delay, CTLFLAG_RDTUN, &xsoftc.boot_delay, 0, "Bus registration wait time"); SYSCTL_UINT(_kern_cam, OID_AUTO, xpt_generation, CTLFLAG_RD, &xsoftc.xpt_generation, 0, "CAM peripheral generation count"); -SYSCTL_INT(_kern_cam, OID_AUTO, announce_nosbuf, CTLFLAG_RWTUN, - &xsoftc.announce_nosbuf, 0, "Don't use sbuf for announcements"); struct cam_doneq { struct mtx_padalign cam_doneq_mtx; @@ -1097,18 +1094,6 @@ xpt_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb, cam_periph_assert(periph, MA_OWNED); periph->flags |= CAM_PERIPH_ANNOUNCED; - /* Fall back to the non-sbuf method if necessary */ - if (xsoftc.announce_nosbuf != 0) { - xpt_announce_periph(periph, announce_string); - return; - } - proto = xpt_proto_find(path->device->protocol); - if (((proto != NULL) && (proto->ops->announce_sbuf == NULL)) || - (path->bus->xport->ops->announce_sbuf == NULL)) { - xpt_announce_periph(periph, announce_string); - return; - } - sbuf_printf(sb, "%s%d at %s%d bus %d scbus%d target %d lun %jx\n", periph->periph_name, periph->unit_number, path->bus->sim->sim_name, @@ -1118,7 +1103,7 @@ xpt_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb, path->target->target_id, (uintmax_t)path->device->lun_id); sbuf_printf(sb, "%s%d: ", periph->periph_name, periph->unit_number); - + proto = xpt_proto_find(path->device->protocol); if (proto) proto->ops->announce_sbuf(path->device, sb); else @@ -1157,11 +1142,6 @@ void xpt_announce_quirks_sbuf(struct cam_periph *periph, struct sbuf *sb, int quirks, char *bit_string) { - if (xsoftc.announce_nosbuf != 0) { - xpt_announce_quirks(periph, quirks, bit_string); - return; - } - if (quirks != 0) { sbuf_printf(sb, "%s%d: quirks=0x%b\n", periph->periph_name, periph->unit_number, quirks, bit_string); @@ -1202,17 +1182,6 @@ xpt_denounce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) cam_periph_assert(periph, MA_OWNED); - /* Fall back to the non-sbuf method if necessary */ - if (xsoftc.announce_nosbuf != 0) { - xpt_denounce_periph(periph); - return; - } - proto = xpt_proto_find(path->device->protocol); - if ((proto != NULL) && (proto->ops->denounce_sbuf == NULL)) { - xpt_denounce_periph(periph); - return; - } - sbuf_printf(sb, "%s%d at %s%d bus %d scbus%d target %d lun %jx\n", periph->periph_name, periph->unit_number, path->bus->sim->sim_name, @@ -1222,7 +1191,7 @@ xpt_denounce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) path->target->target_id, (uintmax_t)path->device->lun_id); sbuf_printf(sb, "%s%d: ", periph->periph_name, periph->unit_number); - + proto = xpt_proto_find(path->device->protocol); if (proto) proto->ops->denounce_sbuf(path->device, sb); else