From patchwork Thu Aug 10 02:16:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 133669 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp142892vqi; Wed, 9 Aug 2023 19:47:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQ8IB8GFHZZeUx63EsQpf1YMawwvc02dPSIbJ1eOFkp8A8tmvfhqelVBKHVNoHq1x6z715 X-Received: by 2002:a05:6358:2927:b0:133:7f9:303f with SMTP id y39-20020a056358292700b0013307f9303fmr1317727rwb.23.1691635638441; Wed, 09 Aug 2023 19:47:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691635638; cv=none; d=google.com; s=arc-20160816; b=ZNPQhk9vsIaP9ZsYZlOa7y2Y3IjXEGIncaRP3f7va13Dw7mdQBs1xY6ZVHuWaC5ZSg 8LaBXpV9HRG4NniOL3nQcAo3JcWeq+DaHHPSYsYNfSVaKazrHzZZjfno+H+mUMfcpw59 cTUJBquhuFqq75L2fJ3yuxF97vks8I5IFIkxuf5Z2Gqkvo9gvrApJDNejPGq0NUJ9ON8 jFNF8J7ccTJ75jmugYOPVQ585XAVmpKR/Ftk9Fttv8ZsmhoCKFs6Z7pfAcx+qQ0qzF1t Awtuj+WFHJpHuAXyQYt9HZEdjbrJusSHhhN29r4MpPmmhprxEycHu0Rx8uq6XD8pmZ+1 jn1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Kn2gdSjEHu02/v4mAeMAEf4LvFeRTaYDVdUmz7aC8GI=; fh=DdWkxXz8gFdXQexLzk3IFWxCbo85gIHWTQronOtbJe4=; b=OCt52SO8nHEufbjw2rCYgWyTeAqJA4o6VCEoZOGxv0+UQ8YdJTmz58PS+S62fl08W9 QCcSUEoSz+NoJpYn1l3Yzm+wA5tT/uaGb6YUqrD3Nhs0k5/jYHkvlZ8FpOkb5ejqGvZz NA2GonDIOFvN7IyF6TFM9+Oz2gTzHsnPLIUcxDJf8EoqiIG9VIjS0V5y4tAHPnXjzAEh 35CK3M+g2Lj0WGaRq2otsT0BjJowsyGlEkZGva6ZhWj0uFAzY4SP13YgquxSFcHUR4el yHhCae7sbRUvfr/wxVveitg3YS4EcWx3Cwv8VgMwx02+mn/JoRfWCTFNCGg4gUlOu+bv +9ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hK0mcXyo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e192-20020a6369c9000000b005404f8dd0easi558928pgc.292.2023.08.09.19.47.05; Wed, 09 Aug 2023 19:47:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hK0mcXyo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231250AbjHJCRq (ORCPT + 99 others); Wed, 9 Aug 2023 22:17:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229503AbjHJCRo (ORCPT ); Wed, 9 Aug 2023 22:17:44 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D98C1736 for ; Wed, 9 Aug 2023 19:16:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691633817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Kn2gdSjEHu02/v4mAeMAEf4LvFeRTaYDVdUmz7aC8GI=; b=hK0mcXyoL2OKvwJ1/aMFSy+yC91sTk7p3LRhRexxMTcXWUc/jPhtYobM/eh1u56Yf28MVh 0wY0Zsb4f/vWRI7JnlFxa3NndMBvklHEFgP4RtNgdE7sJlFDpteBimH6Rlv0yMbdwsyVHm CDcBUIejsZ4bQ9+GB0aXSk3CrH/qbRI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-517-_Ag9I_rmMV2p-eVMLrwEjg-1; Wed, 09 Aug 2023 22:16:55 -0400 X-MC-Unique: _Ag9I_rmMV2p-eVMLrwEjg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5B43E185A78B; Thu, 10 Aug 2023 02:16:55 +0000 (UTC) Received: from localhost (unknown [10.72.120.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 800CE1121314; Thu, 10 Aug 2023 02:16:54 +0000 (UTC) From: Ming Lei To: Thomas Gleixner Cc: linux-kernel@vger.kernel.org, Ming Lei , Keith Busch , linux-nvme@lists.infradead.org, linux-block@lists.infradead.org, Yi Zhang , Guangwu Zhang Subject: [PATCH] lib/group_cpus.c: avoid to acquire cpu hotplug lock in group_cpus_evenly Date: Thu, 10 Aug 2023 10:16:40 +0800 Message-Id: <20230810021640.252033-1-ming.lei@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773808531561853838 X-GMAIL-MSGID: 1773808531561853838 group_cpus_evenly() could be part of storage driver's error handler, such as nvme driver, when may happen during CPU hotplug, in which storage queue has to drain its pending IOs because all CPUs associated with the queue are offline and the queue is becoming inactive. And handling IO needs error handler to provide forward progress. Then dead lock is caused: 1) inside CPU hotplug handler, CPU hotplug lock is held, and blk-mq's handler is waiting for inflight IO 2) error handler is waiting for CPU hotplug lock 3) inflight IO can't be completed in blk-mq's CPU hotplug handler because error handling can't provide forward progress. Solve the deadlock by not holding CPU hotplug lock in group_cpus_evenly(), in which two stage spreads are taken: 1) the 1st stage is over all present CPUs; 2) the end stage is over all other CPUs. Turns out the two stage spread just needs consistent 'cpu_present_mask', and remove the CPU hotplug lock by storing it into one local cache. This way doesn't change correctness, because all CPUs are still covered. Cc: Keith Busch Cc: linux-nvme@lists.infradead.org Cc: linux-block@lists.infradead.org Reported-by: Yi Zhang Reported-by: Guangwu Zhang Signed-off-by: Ming Lei Tested-by: Guangwu Zhang --- lib/group_cpus.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/group_cpus.c b/lib/group_cpus.c index aa3f6815bb12..15006e79196f 100644 --- a/lib/group_cpus.c +++ b/lib/group_cpus.c @@ -348,6 +348,7 @@ struct cpumask *group_cpus_evenly(unsigned int numgrps) { unsigned int curgrp = 0, nr_present = 0, nr_others = 0; cpumask_var_t *node_to_cpumask; + cpumask_var_t local_cpu_present_mask; cpumask_var_t nmsk, npresmsk; int ret = -ENOMEM; struct cpumask *masks = NULL; @@ -355,6 +356,16 @@ struct cpumask *group_cpus_evenly(unsigned int numgrps) if (!zalloc_cpumask_var(&nmsk, GFP_KERNEL)) return NULL; + if (!zalloc_cpumask_var(&local_cpu_present_mask, GFP_KERNEL)) + goto fail_local_pres_mask; + + /* + * Make a local cache of 'cpu_present_mask', so the two stages + * spread can observe consistent 'cpu_present_mask' without holding + * cpu hotplug lock. + */ + cpumask_copy(local_cpu_present_mask, cpu_present_mask); + if (!zalloc_cpumask_var(&npresmsk, GFP_KERNEL)) goto fail_nmsk; @@ -366,13 +377,11 @@ struct cpumask *group_cpus_evenly(unsigned int numgrps) if (!masks) goto fail_node_to_cpumask; - /* Stabilize the cpumasks */ - cpus_read_lock(); build_node_to_cpumask(node_to_cpumask); /* grouping present CPUs first */ ret = __group_cpus_evenly(curgrp, numgrps, node_to_cpumask, - cpu_present_mask, nmsk, masks); + local_cpu_present_mask, nmsk, masks); if (ret < 0) goto fail_build_affinity; nr_present = ret; @@ -387,15 +396,13 @@ struct cpumask *group_cpus_evenly(unsigned int numgrps) curgrp = 0; else curgrp = nr_present; - cpumask_andnot(npresmsk, cpu_possible_mask, cpu_present_mask); + cpumask_andnot(npresmsk, cpu_possible_mask, local_cpu_present_mask); ret = __group_cpus_evenly(curgrp, numgrps, node_to_cpumask, npresmsk, nmsk, masks); if (ret >= 0) nr_others = ret; fail_build_affinity: - cpus_read_unlock(); - if (ret >= 0) WARN_ON(nr_present + nr_others < numgrps); @@ -406,6 +413,9 @@ struct cpumask *group_cpus_evenly(unsigned int numgrps) free_cpumask_var(npresmsk); fail_nmsk: + free_cpumask_var(local_cpu_present_mask); + + fail_local_pres_mask: free_cpumask_var(nmsk); if (ret < 0) { kfree(masks);