Date: Tue, 17 Dec 2019 04:21:35 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355843 - head/sys/cam/nvme Message-ID: <201912170421.xBH4LZd8035588@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Dec 17 04:21:35 2019 New Revision: 355843 URL: https://svnweb.freebsd.org/changeset/base/355843 Log: Revert r355831 It wasn't supposed to change the defaults, but actually does. Back this out until that can be sorted out. Modified: head/sys/cam/nvme/nvme_da.c Modified: head/sys/cam/nvme/nvme_da.c ============================================================================== --- head/sys/cam/nvme/nvme_da.c Tue Dec 17 03:30:49 2019 (r355842) +++ head/sys/cam/nvme/nvme_da.c Tue Dec 17 04:21:35 2019 (r355843) @@ -177,14 +177,6 @@ static int nda_max_trim_entries = NDA_MAX_TRIM_ENTRIES SYSCTL_INT(_kern_cam_nda, OID_AUTO, max_trim, CTLFLAG_RDTUN, &nda_max_trim_entries, NDA_MAX_TRIM_ENTRIES, "Maximum number of BIO_DELETE to send down as a DSM TRIM."); -static int nda_goal_trim_entries = NDA_MAX_TRIM_ENTRIES / 2; -SYSCTL_INT(_kern_cam_nda, OID_AUTO, goal_trim, CTLFLAG_RDTUN, - &nda_goal_trim_entries, NDA_MAX_TRIM_ENTRIES / 2, - "Number of BIO_DELETE to try to accumulate before sending a DSM TRIM."); -static int nda_trim_ticks = 50; /* 50ms ~ 1000 Hz */ -SYSCTL_INT(_kern_cam_nda, OID_AUTO, trim_ticks, CTLFLAG_RDTUN, - &nda_trim_ticks, 50, - "Number of ticks to hold BIO_DELETEs before sending down a trim"); /* * All NVMe media is non-rotational, so all nvme device instances @@ -749,9 +741,6 @@ ndaregister(struct cam_periph *periph, void *arg) free(softc, M_DEVBUF); return(CAM_REQ_CMP_ERR); } - /* Statically set these for the moment */ - cam_iosched_set_trim_goal(softc->cam_iosched, nda_goal_trim_entries); - cam_iosched_set_trim_ticks(softc->cam_iosched, nda_trim_ticks); /* ident_data parsing */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912170421.xBH4LZd8035588>