From owner-svn-src-stable-11@freebsd.org Thu Feb 1 15:45:23 2018 Return-Path: Delivered-To: svn-src-stable-11@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 7EC9FED8FA0; Thu, 1 Feb 2018 15:45:23 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-yw0-x235.google.com (mail-yw0-x235.google.com [IPv6:2607:f8b0:4002:c05::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0EF4C727DD; Thu, 1 Feb 2018 15:45:23 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: by mail-yw0-x235.google.com with SMTP id u21so10745589ywc.2; Thu, 01 Feb 2018 07:45:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=vyPa8NxNhRLrcDk7+cbwyGZjOPTH0ZPRJkm2f0wGQYY=; b=n3Z4NGxNz94/VDHIvY7oD4JHE+3utXvnCsutIuj5c9GSpqO/VE8jPLJFdaQhSBkx1a /TUq08fCM7umYKuRsmkQxtnjhYHEAcVBkJuxJAwsydqVugOpi8kIFsVIT+uT75UVGkam tpWvpGvVOjlELLBI5DZTHoaTiWVFvbpNCdwJ1LpQI2NtgJ0eu4I4/OucSIMgu7Mon+bq 7iXfiWpXZUVbLE61o0s0GY/mzLCmjZCo6TjOxChk82xpZT7BZIdFeY0uWGPwwB+6jTpt LMogXz85vMrE44PilfYpae90rx1iT3xKITYAGDEcMW1f2A3NY621gt3OBr27LXmASA1V DyTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=vyPa8NxNhRLrcDk7+cbwyGZjOPTH0ZPRJkm2f0wGQYY=; b=X2WRQEwVjc+g7p9DmltgQ8pqzTHl3q8tupnm4k53f1w53dLKKitPrZAR6MRZseK7xb KZmhPP827xixidbE2oCYt7ij7jPhqA0WzRzjMNIvOTbdv+Q8bI6mz6iHxnJDnglEGdjE F1nw+ahIMEs8cUm1MGOiQUsn34eI3ZA/KI4YqB9vVjY3GqlH1rdQ/WbxGIALLUaOiim6 w913Wqk97JTHlC7/ZDW9x8uOobbrYaEm8BXIZ5EUW+PmInyNYmRUlkrmBGLApbsG2PAU jQvS56W3Oz+0TrY749V4XXx8zk35SGPAPpShWbOkuL5DVPWl0O+cysLpYrd4ru3Z3PYZ 7r3g== X-Gm-Message-State: AKwxytc/eufw0zV1cMsVvrrjnWkHSLkvIOj/cqcu2DYkdCPUtUumtuu5 l/wDAgc6s38ZSJbSZKa2BozJhqGL X-Google-Smtp-Source: AH8x224gWXE03a2EgXyZkNyPXvIpp0H8+FrYHM6U9Akt7dFPWeO4kIus2r+wImOKuLHhr4/s2Rm/Hw== X-Received: by 10.37.44.207 with SMTP id s198mr5915682ybs.238.1517499922315; Thu, 01 Feb 2018 07:45:22 -0800 (PST) Received: from mavoffice.ixsystems.com ([12.164.17.129]) by smtp.gmail.com with ESMTPSA id u3sm7111593ywg.28.2018.02.01.07.45.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 07:45:21 -0800 (PST) Sender: Alexander Motin Subject: Re: svn commit: r328666 - stable/11/sys/dev/nvme To: Warner Losh Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org References: <201802011532.w11FWmIa088204@repo.freebsd.org> From: Alexander Motin Message-ID: <35677873-32dc-67a1-6cee-9e300b5d0674@FreeBSD.org> Date: Thu, 1 Feb 2018 10:45:21 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2018 15:45:23 -0000 On 01.02.2018 10:35, Warner Losh wrote: > I'd been specifically not MFC'ing the NVME stuff because I wasn't sure > that its ABI had jelled yet.... > > Be sure to merge everything because there's 0 support for anything but > the tip of -current for the NVME CAM stuff. Sure, as much as ABI permit. I just found that we need some of recent head changes for some NVMe devices to work, and then found that the code in area was not merged for a year. I don't like random cherry-picking, > On Thu, Feb 1, 2018 at 8:32 AM, Alexander Motin > wrote: > > Author: mav > Date: Thu Feb  1 15:32:48 2018 > New Revision: 328666 > URL: https://svnweb.freebsd.org/changeset/base/328666 > > > Log: >   MFC r303466: Kill a few stray debug printfs. > > Modified: >   stable/11/sys/dev/nvme/nvme_sim.c > Directory Properties: >   stable/11/   (props changed) > > Modified: stable/11/sys/dev/nvme/nvme_sim.c > ============================================================================== > --- stable/11/sys/dev/nvme/nvme_sim.c   Thu Feb  1 15:32:14 2018    >     (r328665) > +++ stable/11/sys/dev/nvme/nvme_sim.c   Thu Feb  1 15:32:48 2018    >     (r328666) > @@ -133,8 +133,6 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb) >         ns = sim2ns(sim); >         ctrlr = sim2ctrlr(sim); > > -       printf("Sim action: ctrlr %p ns %p\n", ctrlr, ns); > - >         mtx_assert(&ctrlr->lock, MA_OWNED); > >         switch (ccb->ccb_h.func_code) { > @@ -310,8 +308,6 @@ nvme_sim_new_ns(struct nvme_namespace *ns, void > *sc_ar > >         sc->s_ns = ns; > > -       printf("Our SIM's softc %p ctrlr %p ns %p\n", sc, ctrlr, ns); > - >         /* >          * XXX this is creating one bus per ns, but it should be one >          * XXX target per controller, and one LUN per namespace. > @@ -349,7 +345,6 @@ nvme_sim_new_ns(struct nvme_namespace *ns, void > *sc_ar >         sc->s_path->device->nvme_cdata = nvme_ctrlr_get_data(ns->ctrlr); > >  /* Scan bus */ > -       printf("Initiate rescan of the bus\n"); >         nvme_sim_rescan_target(ctrlr, sc->s_path); > >         mtx_unlock(&ctrlr->lock); > > -- Alexander Motin