From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A70DC2BA19 for ; Tue, 14 Apr 2020 11:35:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1767C206D5 for ; Tue, 14 Apr 2020 11:35:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="FH6PtdqM"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="S8Q6ivvU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439324AbgDNLfD (ORCPT ); Tue, 14 Apr 2020 07:35:03 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:58191 "EHLO wout4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439311AbgDNLfB (ORCPT ); Tue, 14 Apr 2020 07:35:01 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 30D03838; Tue, 14 Apr 2020 07:34:58 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 14 Apr 2020 07:34:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=CajYkw12Wg26QGl9v1uChV7VMYo edWz1DqxKqGkHlpw=; b=FH6PtdqMwU14ZKPrF33MbxkqctFFryBJGzzvj95BUpe 60l+jk0D6A1rxbtvPA8Eq0W0zx+bG/pfcYprWifGoziUfI8Hn4qNttj9oMjZYaqT S3M4XYTFJGVBtrWSOCVlJf8P7jPiKWvTtCoKxWLWGpAb0IpPX5c4nG8VmukRgV/6 CdfZ180GLbkOQuFpkWjIb0BFmkDAdBib5bqYF4ZUo5EUCf5lJpZeVJHL12zFz70x 9FIRdgpRt/b6bvBj8Fxt4sI2fcwZVFIIm21IQEcA9oouhWPXIYhPEu5k41/P7j7T ouNDMnCrWMMvzyzsC14VhrnntmRTERKOVfWuIXahJqw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=CajYkw 12Wg26QGl9v1uChV7VMYoedWz1DqxKqGkHlpw=; b=S8Q6ivvUgSaO+nMq3R6Dl2 3nSITdNS3zomVNfAp4O9/v5f4BpCSbbrMWiZz98tixo8eD3ONWgfglaRphzLsw7Z bLq/P9rw17/wb0STS88lXFSJ7fhkoW5DNM3jzuIs/cTSFRVxCN/oVqIk2KfUvGYU b+0N7cd+90igD3wLoJIxRKqDvOGSkRvOifL/U1feP4NUJlwmz4MgGEdz4D5TyylD jk/2PqQzXPTMS/pBKQCiKXGuQszVtWzXgO3nnjmH1FeK/gU4SfnQrs4WvpB2HvlW ZVZQSHVzhvIgfgT17NP1cGhOAsQcq/rbCj9/gXJa/jKot4wUXaPOEe2oG/YesiSQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrfedugdegudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghgucfm jfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecukfhppeekfedrkeeirdekledruddtje enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgv gheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 503C33060062; Tue, 14 Apr 2020 07:34:57 -0400 (EDT) Date: Tue, 14 Apr 2020 13:34:56 +0200 From: Greg KH To: Sagi Grimberg Cc: stable@vger.kernel.org Subject: Re: [PATCH stable 4.18+] nvme: Treat discovery subsystems as unique subsystems Message-ID: <20200414113456.GA441876@kroah.com> References: <20200413081349.16278-1-sagi@grimberg.me> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200413081349.16278-1-sagi@grimberg.me> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Apr 13, 2020 at 01:13:49AM -0700, Sagi Grimberg wrote: > From: James Smart > > [ Upstream commit c26aa572027d438de9cc311aaebcbe972f698c24 ] > > Current code matches subnqn and collapses all controllers to the > same subnqn to a single subsystem structure. This is good for > recognizing multiple controllers for the same subsystem. But with > the well-known discovery subnqn, the subsystems aren't truly the > same subsystem. As such, subsystem specific rules, such as no > overlap of controller id, do not apply. With today's behavior, the > check for overlap of controller id can fail, preventing the new > discovery controller from being created. > > When searching for like subsystem nqn, exclude the discovery nqn > from matching. This will result in each discovery controller being > attached to a unique subsystem structure. > > Signed-off-by: James Smart > Reviewed-by: Sagi Grimberg > Reviewed-by: Christoph Hellwig > Reviewed-by: Max Gurtovoy > Signed-off-by: Sagi Grimberg > --- > drivers/nvme/host/core.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index fad04282148d..0545eb97d838 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -2374,6 +2374,17 @@ static struct nvme_subsystem *__nvme_find_get_subsystem(const char *subsysnqn) > > lockdep_assert_held(&nvme_subsystems_lock); > > + /* > + * Fail matches for discovery subsystems. This results > + * in each discovery controller bound to a unique subsystem. > + * This avoids issues with validating controller values > + * that can only be true when there is a single unique subsystem. > + * There may be multiple and completely independent entities > + * that provide discovery controllers. > + */ > + if (!strcmp(subsysnqn, NVME_DISC_SUBSYS_NAME)) > + return NULL; > + > list_for_each_entry(subsys, &nvme_subsystems, entry) { > if (strcmp(subsys->subnqn, subsysnqn)) > continue; > -- > 2.20.1 > Now queued up, thanks. greg k-h