Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp59844iof; Sun, 5 Jun 2022 21:05:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrv/KOONYsGBUm4+WEuIYwJTG+/6LrpnlCb2pwDdkkrJkKYZ4wWjMX1SggGfOyKKaScC0s X-Received: by 2002:a63:b57:0:b0:3fb:2369:2298 with SMTP id a23-20020a630b57000000b003fb23692298mr19660200pgl.524.1654488341338; Sun, 05 Jun 2022 21:05:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654488341; cv=none; d=google.com; s=arc-20160816; b=LokNBtcSKr2Vam81lTRSOOjJ/sQBsAyy28IIDTzA8CR/IfI5vjMzMR9ZFNP6oSRMlP 2eM4LO424K56CndH5+8STxOsjqY9dz+JM0R8OUm88hqTCLoyZu1IVMrkp29LFQCCdogi Cx5Y3s3wUpJ902XLJvFPfCFK9sMgtkbTsnOIRbqvhgWaOMx5Ws0Y8umPrDBjO9BuE8mn O1ySca4/6pqmPjMyDZd8Kxy9n5ov9qjwglX6DVA2In+bQ0wklaZcSLQ/9W1H5H4xkIwC 8mjxhA1U4fwyLOb/jVQm6C5TvVk4d5aCERnkLVXmoph/00iILcosrBrg03gQ2dt5Lvus 3GFQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uNPII/pH07TUA9F/InhEUlMSM7EhWaJQNkhI2Yqxj30=; b=Wx4MlVsNBy68QTcgu4kMEZ6W38hlWqmPfxESUg87z24Ij9d14SMlJv8tEjlzXcqaw0 Kb58VozAZCL5sDgIrw45jLBiYF7vsZJEBMK/Bgqbop7HTyGdG5u4ooSDB45yh7qG+zzu xSChp3ny++PbQqrXwc/Zd1deqA3Z5+UEoQTJH9wgNj0wXBV3cGFbGujH/iP0nZ52XAJT VeqHcG+ewWH2U4XgId9Ns2Zsce9cT8ZSyOjfn38AloFuq1Aej2AX7p66QlbwNbEZr58R XSCQcL4NUA0VevU8bwCMJpGMJvp9S83h0CHfSn9V013NtOGAtNyl1hp2AmxP6WCVOxXz UGMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XcqYFcU0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id z6-20020a170902d54600b001586190b7c1si1447965plf.528.2022.06.05.21.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 21:05:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XcqYFcU0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B4B525FAC; Sun, 5 Jun 2022 20:47:18 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238179AbiFCSBY (ORCPT + 99 others); Fri, 3 Jun 2022 14:01:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347225AbiFCRwI (ORCPT ); Fri, 3 Jun 2022 13:52:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F41B562E9; Fri, 3 Jun 2022 10:50:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B723A60EE9; Fri, 3 Jun 2022 17:50:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEF9FC385B8; Fri, 3 Jun 2022 17:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654278635; bh=8Zu7MjpXWW9lQAoYnVgd0XW5X1hTwM+Sak8w4dzHC0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XcqYFcU0ojKGcqyT5+TpFfyVBO/1y1LNYbqX6D5OpnRErYwb5dGpFN93ecCbLxX+h HFG2+7DTA21k0q11YX9ztwhjfLmLUzKECits3g/1Mrq4g9TUo1PIiPUo/Anuk2PPhD Hm4yqf9VSa25qFoqwSTsiYPl33qmTK8F11jwnFsE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mikulas Patocka , Mike Snitzer Subject: [PATCH 5.15 44/66] dm stats: add cond_resched when looping over entries Date: Fri, 3 Jun 2022 19:43:24 +0200 Message-Id: <20220603173821.942579769@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603173820.663747061@linuxfoundation.org> References: <20220603173820.663747061@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 From: Mikulas Patocka commit bfe2b0146c4d0230b68f5c71a64380ff8d361f8b upstream. dm-stats can be used with a very large number of entries (it is only limited by 1/4 of total system memory), so add rescheduling points to the loops that iterate over the entries. Cc: stable@vger.kernel.org Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-stats.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/drivers/md/dm-stats.c +++ b/drivers/md/dm-stats.c @@ -225,6 +225,7 @@ void dm_stats_cleanup(struct dm_stats *s atomic_read(&shared->in_flight[READ]), atomic_read(&shared->in_flight[WRITE])); } + cond_resched(); } dm_stat_free(&s->rcu_head); } @@ -330,6 +331,7 @@ static int dm_stats_create(struct dm_sta for (ni = 0; ni < n_entries; ni++) { atomic_set(&s->stat_shared[ni].in_flight[READ], 0); atomic_set(&s->stat_shared[ni].in_flight[WRITE], 0); + cond_resched(); } if (s->n_histogram_entries) { @@ -342,6 +344,7 @@ static int dm_stats_create(struct dm_sta for (ni = 0; ni < n_entries; ni++) { s->stat_shared[ni].tmp.histogram = hi; hi += s->n_histogram_entries + 1; + cond_resched(); } } @@ -362,6 +365,7 @@ static int dm_stats_create(struct dm_sta for (ni = 0; ni < n_entries; ni++) { p[ni].histogram = hi; hi += s->n_histogram_entries + 1; + cond_resched(); } } } @@ -497,6 +501,7 @@ static int dm_stats_list(struct dm_stats } DMEMIT("\n"); } + cond_resched(); } mutex_unlock(&stats->mutex); @@ -774,6 +779,7 @@ static void __dm_stat_clear(struct dm_st local_irq_enable(); } } + cond_resched(); } } @@ -889,6 +895,8 @@ static int dm_stats_print(struct dm_stat if (unlikely(sz + 1 >= maxlen)) goto buffer_overflow; + + cond_resched(); } if (clear)