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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFE00E7C4E9 for ; Wed, 4 Oct 2023 18:08:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243817AbjJDSIV (ORCPT ); Wed, 4 Oct 2023 14:08:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243846AbjJDSIU (ORCPT ); Wed, 4 Oct 2023 14:08:20 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B122A7 for ; Wed, 4 Oct 2023 11:08:17 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73310C433CA; Wed, 4 Oct 2023 18:08:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1696442896; bh=m9w7ZcEZp9EK3UGqC8oryKeKJUzm/qdW9mkRM7nvmgA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j+UXatmeg53+nlWQlER14ShjLS1wr5v+LoZwUubMjw9GX1ev7NiK+o3D4w1xvc9YV uHgHiZvNDFxXDzxsHEPL9H3aLtXTpx/mj6c6wCOpGYeKijKXiHY4ozLAPq1ZXboo7G 5A7iTyoUkJIUtVItlAMX1Li4mDEkNxwu6aVS2ftQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pratyush Yadav , Keith Busch , Sasha Levin Subject: [PATCH 5.15 147/183] nvme-pci: do not set the NUMA node of device if it has none Date: Wed, 4 Oct 2023 19:56:18 +0200 Message-ID: <20231004175210.174588416@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004175203.943277832@linuxfoundation.org> References: <20231004175203.943277832@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pratyush Yadav [ Upstream commit dad651b2a44eb6b201738f810254279dca29d30d ] If a device has no NUMA node information associated with it, the driver puts the device in node first_memory_node (say node 0). Not having a NUMA node and being associated with node 0 are completely different things and it makes little sense to mix the two. Signed-off-by: Pratyush Yadav Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/pci.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 0779bf2378264..e5980df2094ad 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2975,9 +2975,6 @@ static struct nvme_dev *nvme_pci_alloc_dev(struct pci_dev *pdev, struct nvme_dev *dev; int ret = -ENOMEM; - if (node == NUMA_NO_NODE) - set_dev_node(&pdev->dev, first_memory_node); - dev = kzalloc_node(sizeof(*dev), GFP_KERNEL, node); if (!dev) return NULL; -- 2.40.1