From owner-svn-src-head@freebsd.org Mon Feb 10 00:23:22 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05249246B7E; Mon, 10 Feb 2020 00:23:22 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48G67s6Jw7z3FPf; Mon, 10 Feb 2020 00:23:21 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D379DEAF3; Mon, 10 Feb 2020 00:23:21 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01A0NL5s053560; Mon, 10 Feb 2020 00:23:21 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01A0NKmY053556; Mon, 10 Feb 2020 00:23:20 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <202002100023.01A0NKmY053556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Mon, 10 Feb 2020 00:23:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357710 - in head/sys: cam/ata cam/nvme cam/scsi ufs/ffs X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: in head/sys: cam/ata cam/nvme cam/scsi ufs/ffs X-SVN-Commit-Revision: 357710 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2020 00:23:22 -0000 Author: scottl Date: Mon Feb 10 00:23:20 2020 New Revision: 357710 URL: https://svnweb.freebsd.org/changeset/base/357710 Log: Add rudamentary support for UFS to probe whether a block device supports the BIO_SPEEDUP command. Add complimentary support to the CAM periphs that support it. Modified: head/sys/cam/ata/ata_da.c head/sys/cam/nvme/nvme_da.c head/sys/cam/scsi/scsi_da.c head/sys/ufs/ffs/ffs_softdep.c head/sys/ufs/ffs/ffs_vfsops.c Modified: head/sys/cam/ata/ata_da.c ============================================================================== --- head/sys/cam/ata/ata_da.c Mon Feb 10 00:05:04 2020 (r357709) +++ head/sys/cam/ata/ata_da.c Mon Feb 10 00:23:20 2020 (r357710) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #endif /* _KERNEL */ @@ -1565,6 +1566,10 @@ adagetattr(struct bio *bp) { int ret; struct cam_periph *periph; + + /* TODO: tunable knob */ + if (g_handleattr_int(bp, "GEOM::canspeedup", 1)) + return (0); periph = (struct cam_periph *)bp->bio_disk->d_drv1; cam_periph_lock(periph); Modified: head/sys/cam/nvme/nvme_da.c ============================================================================== --- head/sys/cam/nvme/nvme_da.c Mon Feb 10 00:05:04 2020 (r357709) +++ head/sys/cam/nvme/nvme_da.c Mon Feb 10 00:23:20 2020 (r357710) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #endif /* _KERNEL */ @@ -699,6 +700,10 @@ ndagetattr(struct bio *bp) { int ret; struct cam_periph *periph; + + /* TODO: tunable knob */ + if (g_handleattr_int(bp, "GEOM::canspeedup", 1)) + return (0); periph = (struct cam_periph *)bp->bio_disk->d_drv1; cam_periph_lock(periph); Modified: head/sys/cam/scsi/scsi_da.c ============================================================================== --- head/sys/cam/scsi/scsi_da.c Mon Feb 10 00:05:04 2020 (r357709) +++ head/sys/cam/scsi/scsi_da.c Mon Feb 10 00:23:20 2020 (r357710) @@ -1942,6 +1942,10 @@ dagetattr(struct bio *bp) int ret; struct cam_periph *periph; + /* TODO: tunable knob for this */ + if (g_handleattr_int(bp, "GEOM::canspeedup", 1)) + return (0); + periph = (struct cam_periph *)bp->bio_disk->d_drv1; cam_periph_lock(periph); ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute, Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Mon Feb 10 00:05:04 2020 (r357709) +++ head/sys/ufs/ffs/ffs_softdep.c Mon Feb 10 00:23:20 2020 (r357710) @@ -1464,6 +1464,9 @@ softdep_send_speedup(struct ufsmount *ump, size_t shor { struct buf *bp; + if ((ump->um_flags & UM_CANSPEEDUP) == 0) + return; + bp = malloc(sizeof(*bp), M_TRIM, M_WAITOK | M_ZERO); bp->b_iocmd = BIO_SPEEDUP; bp->b_ioflags = flags; Modified: head/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vfsops.c Mon Feb 10 00:05:04 2020 (r357709) +++ head/sys/ufs/ffs/ffs_vfsops.c Mon Feb 10 00:23:20 2020 (r357710) @@ -794,7 +794,7 @@ ffs_mountfs(devvp, mp, td) struct ucred *cred; struct g_consumer *cp; struct mount *nmp; - int candelete; + int candelete, canspeedup; off_t loc; fs = NULL; @@ -1009,6 +1009,13 @@ ffs_mountfs(devvp, mp, td) ump->um_trimhash = hashinit(MAXTRIMIO, M_TRIM, &ump->um_trimlisthashsize); } + } + + /* TODO: sysctl tunables, runtime modification */ + len = sizeof(int); + if (g_io_getattr("GEOM::canspeedup", cp, &len, &canspeedup) == 0) { + if (canspeedup) + ump->um_flags |= UM_CANSPEEDUP; } ump->um_mountp = mp;