From owner-svn-src-stable-11@freebsd.org Thu Feb 1 15:46:58 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 EC063ED9164 for ; Thu, 1 Feb 2018 15:46:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22e.google.com (mail-io0-x22e.google.com [IPv6:2607:f8b0:4001:c06::22e]) (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 7C54D72ADB for ; Thu, 1 Feb 2018 15:46:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22e.google.com with SMTP id m11so19637722iob.2 for ; Thu, 01 Feb 2018 07:46:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=RMePzu1KI5ViFiVlYZyFQpbUy5kK7W22S9f8PhUvr7o=; b=VdhWzldbi+OUgDdxSLsgIUnlH8HBFddIgL7rjb/6HQEtamhOXjbtRQDD09vBohWVYQ hT+UUMHuV3wZRgo1OolKeyy1Mi/J3iN6GJX5nosaXFKIBv/1tipxdWRbGxs9UK9Fo7eL NK4/zkcRuM9pb+k5M9kkEkhj8v0/l1PTc6nK5DnV2+c3p0szIRDp+zU3D6EHF7TKyJex d+iD4CTH27LpRDnThYAk+DX3h2hg/PRAmtUPDBMRzVIhx/WlhlsQq0GyC6w2NQWwpH7d o/LeicnrjBQBTwntjvOSQiWt97etcYnp5ZIjBMiAQ06F7MUSeJSJnOMV7MMPQMRv7cmL yjpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=RMePzu1KI5ViFiVlYZyFQpbUy5kK7W22S9f8PhUvr7o=; b=VQxFpanbsgLg9yZrGpMmQwU/dQoqTxD363VVSjGFsI6bKSNN4yEqwfGA5IO+pD+clM ddxkkP7h5u+QC8uIi0z0BUYmfjuv4YfqJSbqoSkDYiC759T4c70/w24cwh3XWAlsOHjt QY2IXoR7hY7jIDfqTb4rCyYzIcCcGguMFIR2XQ0rfql2IczNyGGhf22blxjb/T+XlqfZ umQ7Z2apKDDTx2xegq8i8SsUYk8S+INjPtqStH7VqGTyXb+8Loo6wbyzdRW3DWLKxYZs ZTIgCLNSShmx+CukGLWlEXfzIBhQ/K+yK9w9lnOSwjSmqyc/5Banz4sqxEE4ReJCdGCO qwCA== X-Gm-Message-State: AKwxytfZn5NtFn9rkgNKBB2lo6SEO8+ofxZnGOaLldSZM9n5pQx521DP 4DBQYFtSbChCnqsISmbfR3fbalSP4MbRI9uhSBrL/Q== X-Google-Smtp-Source: AH8x224pLrKYua/kjoWgsw6+Z0QiggA7CQxlNgM3MbYJpr4MXh8qUSZ2ue+K8k03gp1T22YtPL4F9rAy5GTz14UrdrA= X-Received: by 10.107.88.12 with SMTP id m12mr35745317iob.136.1517500016812; Thu, 01 Feb 2018 07:46:56 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.201.67 with HTTP; Thu, 1 Feb 2018 07:46:56 -0800 (PST) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: <35677873-32dc-67a1-6cee-9e300b5d0674@FreeBSD.org> References: <201802011532.w11FWmIa088204@repo.freebsd.org> <35677873-32dc-67a1-6cee-9e300b5d0674@FreeBSD.org> From: Warner Losh Date: Thu, 1 Feb 2018 08:46:56 -0700 X-Google-Sender-Auth: R1ZU1u-p0VsAJDgBdg13jUkga8E Message-ID: Subject: Re: svn commit: r328666 - stable/11/sys/dev/nvme To: Alexander Motin Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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:46:58 -0000 On Thu, Feb 1, 2018 at 8:45 AM, Alexander Motin wrote: > 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, There was an ABI breakage in -current that was fixed with this stuff, but if everything is merged, we should be 100% ABI compatible. Please let me know if you think that's not the case. Warner > 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 >