From owner-svn-src-all@freebsd.org Tue Mar 20 05:23:51 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE600F53233; Tue, 20 Mar 2018 05:23:50 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5F7927FBD6; Tue, 20 Mar 2018 05:23:49 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from freyja.zeit4.iv.bundesimmobilien.de ([87.138.105.249]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MSY2q-1f8A5q48xQ-00Rcha; Tue, 20 Mar 2018 06:18:31 +0100 Date: Tue, 20 Mar 2018 06:18:25 +0100 From: "O. Hartmann" To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r331238 - head/sys/cam/nvme Message-ID: <20180320061825.3c11090f@freyja.zeit4.iv.bundesimmobilien.de> In-Reply-To: <201803200337.w2K3b9fL028482@repo.freebsd.org> References: <201803200337.w2K3b9fL028482@repo.freebsd.org> Organization: Walstatt MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:GWKDJkKVpzJIcdPLq/JjaMgZz5065GatdNDkIF5WwiRr5MBWe3k fBuQENYz0t5pRzonxU+aeDJTFPcV68WBEQutO3U0h2oP5BdLOWaInoP2uH/dAszb5q95yOo tlK+hJFGVI1ujldIAmNMpt9JGRYivaD91M8grxNCC+x/o3pmFevaN46vAJFD6VrNgXbf/k2 NUO1e3zV+lBHwRRGohe4g== X-UI-Out-Filterresults: notjunk:1;V01:K0:2wyxAliJBVI=:B8Rwu//6UnifPzytMBwaWT pQMhV6DoYsWwGT7v62LwFTlECztdSv7e6uW38XfvCCTG6VgqsN97lKneDIs32wEtGcW8tR4BT t5kEWePQnj0yuf1hZ3EBrHWMCS0FQ5mPpK0Rw5VKOflSfQkU5mRgHWQu+CVU1Ter6NS9eZk3+ lHfzGDRKwIp5Dpiazz5c8Kb4BuOjT81hr5tto1BTMiOx9jBf2I4XZCQx9YIB9JFeqSHqz/mAK Fo8ZsU/AgQLYrn/qhssAzUNJJn6JHN+mhcp6zt43po7i6IIwryg3ba8d4s7tgf+SR/jnE/wSL LJAndCIHpPwPW4Rchq/c4V/9e4kAkwIC1EAR9vpm87jr4jDv61uzEMstgNL6cbQfwx2qWIfa5 GYTXaMge+gK4/7fb0EpMn/6QXEBIjiAFVo/i5dCKVXogZqbqwWaQvdSN4gJVB4k5hnMNxscPh MWNx5QRL9vaWhg3oUNMb+ZePJ3CzpGZmFtKxr2+nxTBhwJxM3u/8TYWUr6PcxLKvUxtzSo5Gl Gko9E7eSqLi039obgSZa2A9zjlD45Y9Lh69bzWXlrN4Xv4W6N0ulOz6ak4vHxqIzb9XvtOHMg 6biHhQw90/V0iXg8vG3NR0hGRRDtn9uX12xgz2/ChGbRtW8Ok9idO1R9gdnf06mIuEbYHaYRg z+bLf7o9ZWnLY+0eHj9K02En3geRvYFL5L7oA3jncM8HcyzPfM4f8aA95anw0ZYT8ZqjjXfNh Btu6HuqT/XnKdDbXdt7iXIceXPdtkOeM1c0HuRN3uX6tM7mZ3eh9iztAmrTIrYSs2Hg1gO/cd 5wS9JyL4/gmoE4dHcEJlnJF6Cg/kwcnYRY0fbbinfcFEg+wnkE= X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Mar 2018 05:23:51 -0000 On Tue, 20 Mar 2018 03:37:09 +0000 (UTC) Warner Losh wrote: > Author: imp > Date: Tue Mar 20 03:37:09 2018 > New Revision: 331238 > URL: https://svnweb.freebsd.org/changeset/base/331238 > > Log: > Make kern.cam.nda.num_trim tunable to limit the number of BIO_DELETE > requests that we'll collapse into one DSM_TRIM. By default it is a > 256, which is the max that will fit into a 4k page. > > Sponsored by: Netflix > > Modified: > head/sys/cam/nvme/nvme_da.c > > Modified: head/sys/cam/nvme/nvme_da.c > ============================================================================== > --- head/sys/cam/nvme/nvme_da.c Tue Mar 20 03:37:04 2018 > (r331237) +++ head/sys/cam/nvme/nvme_da.c Tue Mar 20 03:37:09 > 2018 (r331238) @@ -167,19 +167,22 @@ static void > ndasuspend(void *arg); #define NDA_MAX_TRIM_ENTRIES 256 /* Number of > DSM trims to use, max 256 */ #endif > > +static SYSCTL_NODE(_kern_cam, OID_AUTO, nda, CTLFLAG_RD, 0, > + "CAM Direct Access Disk driver"); > + > //static int nda_retry_count = NDA_DEFAULT_RETRY; > static int nda_send_ordered = NDA_DEFAULT_SEND_ORDERED; > static int nda_default_timeout = NDA_DEFAULT_TIMEOUT; > 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."); > > /* > * All NVMe media is non-rotational, so all nvme device instances > * share this to implement the sysctl. > */ > static int nda_rotating_media = 0; > - > -static SYSCTL_NODE(_kern_cam, OID_AUTO, nda, CTLFLAG_RD, 0, > - "CAM Direct Access Disk driver"); > > static struct periph_driver ndadriver = > { > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" Buildkernel on CURRENT fails with the error shown below sinde this commit: [...] --- nvme_da.o --- /usr/src/sys/cam/nvme/nvme_da.c:221:72: error: too few arguments provided to function-like macro invocation KASSERT(num_ranges * sizeof(struct nvme_dsm_range) < NVME_MAX_DSM_TRIM); ^ /usr/src/sys/sys/systm.h:99:9: note: macro 'KASSERT' defined here #define KASSERT(exp,msg) do { \ ^ /usr/src/sys/cam/nvme/nvme_da.c:221:2: error: use of undeclared identifier 'KASSERT' KASSERT(num_ranges * sizeof(struct nvme_dsm_range) < NVME_MAX_DSM_TRIM); ^ 2 errors generated. *** [nvme_da.o] Error code 1