Received: by 2002:a05:6358:111d:b0:dc:6189:e246 with SMTP id f29csp2023026rwi; Tue, 1 Nov 2022 02:55:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5UBDOGvDHL9BgILGYKhJ1NCAOZqY40pEuFwhmFFs4fPK6P3gYXseICnQU5nXmrigB4DFoW X-Received: by 2002:a17:90b:1c8e:b0:205:783b:fe32 with SMTP id oo14-20020a17090b1c8e00b00205783bfe32mr37117229pjb.39.1667296535153; Tue, 01 Nov 2022 02:55:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667296535; cv=none; d=google.com; s=arc-20160816; b=N7XeMlnK8t9cxD/ZGoH/BwPTAs3hvgk99JClVCMUY/orfAPCoTE6lk8AzMVc54+Ht7 BLTfYf5xnT5HIlVr6XpQuShEoLyXvwCm0RWJl75tcEgeyJhRdNqkRE5SolcV+VXP0ZGk OnkTnLqyCYUdEfSq+6t7TgsT6Dy5BhSNNSRxfkq4eXfzw/ZemHrRW8opixCcak7ZFVpC c1lEMw/ULJfdXTi0h5z4t1EVBMx++Aa2PxMlRiaBR0kcnLd3xCxXwOq4MFLDsMI4gL3c uxlsztAc4hBptYqaueqvflq5MQ7/bn390EdEWIeCKnqtM+7zmmrgbmtUs+xZjspq/Vbx 2yaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=DWpSAJ3mMXs4hYRWvmKDogPn8sNF/1rN32P/ORd+vOk=; b=mlffZOs9cNE8qbLzGVPaeH43/vYKSjJ1ft2StXR4ZKVtkS1QVPuc3TNDA5WkD12TOa aCePJK1Tdt9zHqYthTYmd0ZfTDJgHnCTUj5Ov806qQ1stfcSdV7Ehf6Kr73FVf3cPBKt gDjT/UoucvPeEQSDN8g7BXIEAeXTesoYm/daSWwpdmvjCZ6Cit1RaHk292PtYqeFIF8x fxvBqljubDjvgZic8iycmxZ5TtpJ/O3fdcfLovNUF2fNqcEYGfra5wL3f4VD8RaZQrfN e6uss+yX9ym2t3IrKuJ35srZGgD14jUeiiYMsda/bRNmhQdFKlEih41/oTt8xWm42u/4 s58A== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s8-20020a655848000000b00460358671e2si11772787pgr.547.2022.11.01.02.54.57; Tue, 01 Nov 2022 02:55:35 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230175AbiKAJeb (ORCPT + 97 others); Tue, 1 Nov 2022 05:34:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230119AbiKAJeX (ORCPT ); Tue, 1 Nov 2022 05:34:23 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B5D618E11; Tue, 1 Nov 2022 02:34:23 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lGL65LYzmVW6; Tue, 1 Nov 2022 17:34:18 +0800 (CST) Received: from huawei.com (10.174.178.129) by kwepemi500016.china.huawei.com (7.221.188.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 1 Nov 2022 17:34:20 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 02/20] block, bfq: Update bfqd->max_budget with bfqd->lock held Date: Tue, 1 Nov 2022 17:33:59 +0800 Message-ID: <20221101093417.10540-3-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221101093417.10540-1-shikemeng@huawei.com> References: <20221101093417.10540-1-shikemeng@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemi500016.china.huawei.com (7.221.188.220) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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 bfq_max_budget and bfq_user_max_budget maybe be in inconsisten state if bfq_max_budget configuration and bfq_max_budget auto-update happen concurrently. Example sequence: config auto-update bfqd->bfq_max_budget = __data if (bfqd->bfq_user_max_budget == 0) bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd); bfqd->bfq_user_max_budget = __data; bfq_max_budget is only update in update_thr_responsiveness_params and configuration code. As update_thr_responsiveness_params is always called under bfqd->lock, fix this by holding lock in configuration code. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 25a88ffd997e..13370c41ad36 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -7328,6 +7328,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e, if (ret) return ret; + spin_lock_irq(&bfqd->lock); if (__data == 0) bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd); else { @@ -7337,6 +7338,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e, } bfqd->bfq_user_max_budget = __data; + spin_unlock_irq(&bfqd->lock); return count; } @@ -7362,8 +7364,11 @@ static ssize_t bfq_timeout_sync_store(struct elevator_queue *e, __data = INT_MAX; bfqd->bfq_timeout = msecs_to_jiffies(__data); + + spin_lock_irq(&bfqd->lock); if (bfqd->bfq_user_max_budget == 0) bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd); + spin_unlock_irq(&bfqd->lock); return count; } -- 2.30.0