From patchwork Wed Dec 27 20:28:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Zanussi X-Patchwork-Id: 183554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1652805dyb; Wed, 27 Dec 2023 12:29:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgXYWf1ofw8OzMExGl+7OFX0OSeIzS00witbOxALU9nickMXRsjjjgr/d491ZZI4Cyx6Sx X-Received: by 2002:a1f:df84:0:b0:4b6:d6f4:ceb6 with SMTP id w126-20020a1fdf84000000b004b6d6f4ceb6mr2299086vkg.32.1703708949689; Wed, 27 Dec 2023 12:29:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703708949; cv=none; d=google.com; s=arc-20160816; b=EZeJxQ0OCfBTjpzfqc0bShglDkhP2rPQZNhNE3GKmwnWS+3L7C57iXL6zWBF7TYuM2 27vzb5W5jTdDT7rYQ+KbbOPutb6l6VqHRbMvZ/TweLgx24Zzql7ET9HeEaeEc30GoXkQ 7S9InMbNfzqekGNmgrxYCqkUDmZe3E+Sc4+UIQMIj0DkSK0dBx97JoAY58Prx2ZGx3k5 jzaEB4NQs6G/lqBEF/CccYvsn48jV/39u6whgwKJ0LpaaTbheRj5Rww9M4nfhhrSBCwP Q3yVhQuM/Sc/DLDy6peA5+DtFhB1glPeQfVNKQia8zVUAhlcBzScJqYItnMzUkzwXY8m VFpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :user-agent:content-transfer-encoding:date:cc:to:from:subject :message-id:dkim-signature; bh=Qz3wyN+nk5jyJ/ityjwGcfylZcRohXGXjJ6r06OQszw=; fh=UZza8rihGxZWDAu0r4AnOEn/KqyurJT45opsMa32Bys=; b=NVWLjpygjydfal2jAXxVje2BooZ7SY0A53k8qYzGaYCJbfCntJNhPyIWOWarVpNgUb X/oo7O8DWd4TVTgZJH/tnb/W1PQVSQqhvwWXC5Oj5qezW7YDnjIUA29PDN1sM8ioqYAf GhpzRA+Q/jYBo99/Moz0BgRofL8aYuiDlPWkdRPvIAya/FvQwMI61urlvnC1sQLoalVv +V75+eA4nSmVBbXJl3raclX/3qhh4mmcxf6WTeZjqH+7iMFGhdXJDozm4eJxA4VDmXOA wQwBNsH1G+0cUyNWlFI9arB+mSgNi48Se/6jLox/vZoYTA+NJLBP2o5l1/JTKhdxfDWX pNPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lrvdMeg6; spf=pass (google.com: domain of linux-kernel+bounces-12239-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12239-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id q9-20020a05620a038900b007811762c5aesi14352716qkm.207.2023.12.27.12.29.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 12:29:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12239-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lrvdMeg6; spf=pass (google.com: domain of linux-kernel+bounces-12239-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12239-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 77FD91C22456 for ; Wed, 27 Dec 2023 20:29:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1AEF847F73; Wed, 27 Dec 2023 20:28:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="lrvdMeg6" X-Original-To: linux-kernel@vger.kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1E4B45946; Wed, 27 Dec 2023 20:28:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703708933; x=1735244933; h=message-id:subject:from:to:cc:date: content-transfer-encoding:mime-version; bh=LBP3V9OVBPjggE/TmVHcccYGhdeKMXq8wuA+Oj8KhSM=; b=lrvdMeg6hJel9gW1qCCb4dTZzUjHVynqB9RtZ3HDpCPLw+77heW9mvKJ S7KeIAJPmf+FxvlD/NTWiUZDpwGm0YS1x6XAgEuvjOtvDeo+2RSd8UpNO P1AIeEKC/HibBPuCcH/UZ7IaMQT/DHndpiwSsTkEcHDApdg/o21bnCqyb 5yX17O65mrYyktZMqX9DezrLWF6/3K9liAJoIjuMwS6ZYNigesL2KfaDK QCPcSGa+GT/FEY/Jt6DYx21Lsg/cKnijfvJnx3tYtCGBHyuFcqoG7NlI1 4/ciUPFFJgag7pfjGDcwjiZZzAmuPfCSxwdUHixOSXc3Hw2np7OyhLKqC Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10936"; a="9872934" X-IronPort-AV: E=Sophos;i="6.04,310,1695711600"; d="scan'208";a="9872934" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Dec 2023 12:28:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10936"; a="807241852" X-IronPort-AV: E=Sophos;i="6.04,310,1695711600"; d="scan'208";a="807241852" Received: from kkvillar-mobl.amr.corp.intel.com ([10.213.180.16]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Dec 2023 12:28:33 -0800 Message-ID: <4bd63cf80a77a696b78d1f16f586ac6517320cd6.camel@linux.intel.com> Subject: [PATCH v2] crypto: iaa - Account for cpu-less numa nodes From: Tom Zanussi To: herbert@gondor.apana.org.au, davem@davemloft.net, fenghua.yu@intel.com Cc: rex.zhang@intel.com, dave.jiang@intel.com, tony.luck@intel.com, rdunlap@infradead.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, dmaengine@vger.kernel.org Date: Wed, 27 Dec 2023 14:28:32 -0600 User-Agent: Evolution 3.44.4-0ubuntu2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786468315578524674 X-GMAIL-MSGID: 1786468315578524674 In some configurations e.g. systems with CXL, a numa node can have 0 cpus and cpumask_nth() will return a cpu value that doesn't exist, which will result in an attempt to add an entry to the wq table at a bad index. To fix this, when iterating the cpus for a node, skip any node that doesn't have cpus. Also, as a precaution, add a warning and bail if cpumask_nth() returns a nonexistent cpu. Reported-by: Zhang, Rex Signed-off-by: Tom Zanussi --- v2: In iaa_crypto_init_module(), if nr_nodes is 0, print an error message and return. drivers/crypto/intel/iaa/iaa_crypto_main.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/intel/iaa/iaa_crypto_main.c b/drivers/crypto/intel/iaa/iaa_crypto_main.c index 5093361b0107..4ebf1950568a 100644 --- a/drivers/crypto/intel/iaa/iaa_crypto_main.c +++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c @@ -1017,12 +1017,17 @@ static void rebalance_wq_table(void) return; } - for_each_online_node(node) { + for_each_node_with_cpus(node) { node_cpus = cpumask_of_node(node); for (cpu = 0; cpu < nr_cpus_per_node; cpu++) { int node_cpu = cpumask_nth(cpu, node_cpus); + if (WARN_ON(node_cpu >= nr_cpu_ids)) { + pr_debug("node_cpu %d doesn't exist!\n", node_cpu); + return; + } + if ((cpu % cpus_per_iaa) == 0) iaa++; @@ -2095,9 +2100,15 @@ static struct idxd_device_driver iaa_crypto_driver = { static int __init iaa_crypto_init_module(void) { int ret = 0; + int node; nr_cpus = num_online_cpus(); - nr_nodes = num_online_nodes(); + for_each_node_with_cpus(node) + nr_nodes++; + if (!nr_nodes) { + pr_err("IAA couldn't find any nodes with cpus\n"); + return -ENODEV; + } nr_cpus_per_node = nr_cpus / nr_nodes; if (crypto_has_comp("deflate-generic", 0, 0))