From patchwork Thu Jan 17 08:35:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Wong X-Patchwork-Id: 1026475 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43gHV71zfjz9s9G; Thu, 17 Jan 2019 19:36:15 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gk39l-0005a6-HE; Thu, 17 Jan 2019 08:36:09 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gk39k-0005ZY-7J for kernel-team@lists.ubuntu.com; Thu, 17 Jan 2019 08:36:08 +0000 Received: from mail-pl1-f200.google.com ([209.85.214.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gk39j-0006yg-RZ for kernel-team@lists.ubuntu.com; Thu, 17 Jan 2019 08:36:08 +0000 Received: by mail-pl1-f200.google.com with SMTP id b24so5616377pls.11 for ; Thu, 17 Jan 2019 00:36:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=j9PfhlbyO4bl7dnO3COEJmoZDFSbRbPJLx/m/dM/5Xw=; b=WF6bZy2KY2KHXq5wEZEF7SL9H1t9MbDQ/1MMEqaAXcliIhFtIhy0UZCkMGFFA23ldS 9tdffKCcZ8snwbiarJZEqXVAJmhBzyWs7qmK/taP1lfzhsLAEs6940RU+6RwRGQ8ALCb 3V150MdYSJ79hCkq8XUfbsHT5D+Nv7zUITPCoyAxFWwzDSBLP6+Bn6M/ECqsJktDTNG2 y7Dy1Be7AktTDOigYKHcPE2DrrKs/i/KvIGrW2VkkJepo96CU2U08DSOIh4t7uICavBt mS4ynV04eVV24F3XfTQUC54owbKF4JUVSMavlSxaST6nPdlJMiT9vonhdqJi1jAIkEDT DrmA== X-Gm-Message-State: AJcUukcB7k/KIC1TDJpgWIoL3tuGfBkjKd4QIJuU1qwsTNARCPMHhagT ZDuZpdtZGwe0P/9FT/VkH30GKxTe4F9QCwPPJFxofB03Y/235bBCeZ4KnN39dpdefK6B2oMqnAs xcnjZ1iiOgCr2vsakbjI0RQSU+O2AmcWcbTj+i2V5fw== X-Received: by 2002:a63:6604:: with SMTP id a4mr12681212pgc.118.1547714166250; Thu, 17 Jan 2019 00:36:06 -0800 (PST) X-Google-Smtp-Source: ALg8bN7vTVzCj5JlvP071KbNSxQoMTHfMZqcyoMHfsbrOMw1Dw2ooHRD6zCjoQBcgevTf54F0sqkiw== X-Received: by 2002:a63:6604:: with SMTP id a4mr12681200pgc.118.1547714165976; Thu, 17 Jan 2019 00:36:05 -0800 (PST) Received: from canonical.com (li1734-10.members.linode.com. [172.104.124.10]) by smtp.gmail.com with ESMTPSA id 128sm1911723pfu.129.2019.01.17.00.36.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jan 2019 00:36:05 -0800 (PST) From: Anthony Wong X-Google-Original-From: Anthony Wong To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] nvme: pad fake subsys NQN vid and ssvid with zeros Date: Thu, 17 Jan 2019 16:35:52 +0800 Message-Id: <1547714153-8055-3-git-send-email-anthony@ypwong.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547714153-8055-1-git-send-email-anthony@ypwong.org> References: <1547714153-8055-1-git-send-email-anthony@ypwong.org> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Keith Busch BugLink: https://bugs.launchpad.net/bugs/1811755 We need to preserve the leading zeros in the vid and ssvid when generating a unique NQN. Truncating these may lead to naming collisions. Signed-off-by: Keith Busch Signed-off-by: Christoph Hellwig (cherry picked from commit 3da584f57133e51aeb84aaefae5e3d69531a1e4f) Signed-off-by: Anthony Wong --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 0eed677..c12df85 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2067,7 +2067,7 @@ static void nvme_init_subnqn(struct nvme_subsystem *subsys, struct nvme_ctrl *ct /* Generate a "fake" NQN per Figure 254 in NVMe 1.3 + ECN 001 */ off = snprintf(subsys->subnqn, NVMF_NQN_SIZE, - "nqn.2014.08.org.nvmexpress:%4x%4x", + "nqn.2014.08.org.nvmexpress:%04x%04x", le16_to_cpu(id->vid), le16_to_cpu(id->ssvid)); memcpy(subsys->subnqn + off, id->sn, sizeof(id->sn)); off += sizeof(id->sn);