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 0BF60CE7A88 for ; Sun, 24 Sep 2023 13:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230252AbjIXNTM (ORCPT ); Sun, 24 Sep 2023 09:19:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229800AbjIXNSk (ORCPT ); Sun, 24 Sep 2023 09:18:40 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81448CC7; Sun, 24 Sep 2023 06:17:32 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49E8DC433D9; Sun, 24 Sep 2023 13:17:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695561452; bh=QbUfRCAME0OFI35Aen84HXcS0Q7RnK2CJu+YfIPSrvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e7gd3NaDi+vQtuyIX7L+MbvBCGUi6iEKMT4KgOZbehvp85WmxQ+cCl+dVFtUPMktf 17EV4ARiY+0yWnh3bfbOGCMqfLDf3mvmzIVAPAPqpqPYDuVUSeF5Bi9dloDlN/mzJz P3B8qfQgcO1Sf4GspuPRU9Tm+kUaot29uTEMJVaX+9+tL/CCQZ4w6ZbGUdt+7Eqb2q tqNiajgany+MX3SqJNRx+QvYRxbHgRsiKthypvn81KaqBXFFPDe2aagYJ8Hw+9Ah57 qreNynRmH1yPmSLXTXZ+ED6AHfmeqOo3sx5vY2RJUmeKRAL1NVhBsHfFSHk+qdtAOn 4uZyxxaUlOsKw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pratyush Yadav , Keith Busch , Sasha Levin , sagi@grimberg.me, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 6.5 35/41] nvme-pci: do not set the NUMA node of device if it has none Date: Sun, 24 Sep 2023 09:15:23 -0400 Message-Id: <20230924131529.1275335-35-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230924131529.1275335-1-sashal@kernel.org> References: <20230924131529.1275335-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.5 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 2f57da12d9836..347cb5daebc3c 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2916,9 +2916,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 ERR_PTR(-ENOMEM); -- 2.40.1