From patchwork Mon Jul 29 15:40:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 170018 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp1427518ile; Mon, 29 Jul 2019 08:40:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqyLjTm2zwL2srDxg+7X+3qO3UWVzQAjDtY+sFYo0UPT5FtQVTKQ2G7semuQCfZ3k9vCer+M X-Received: by 2002:a17:90a:f488:: with SMTP id bx8mr111842985pjb.91.1564414857723; Mon, 29 Jul 2019 08:40:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564414857; cv=none; d=google.com; s=arc-20160816; b=cMcT2I0FHrFsOX/2NfZPTKYkVtdQPu+LSJa2EhmFEDUkFwwdcqKRvp1EZc3eOfCUpZ l5x8oVnrn3FRQjm7Uq9cl72VfKSu2dM3oCYlWtzBpVPS+zYu+mEc2DbMKxlarGdhFkbT xZwMkeP3QGaCxBUmmBaIKxAkC1qTQVA/OYg+h9aiP38g9BBm3W+fil20yHBQj8uqvyCd nYuaKsb8gw0yHIbhzzObwaZBUGISvTiAvnUBz7ccKQZMTtrc6qoenuITysMr9wDAuF+U J4PbwGbaFkYF9ykJdz0RUIXkamWQMBBBycg6Y9OZPsfcecA+Ou2u9eeVR1pTaEK267k1 OjbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=loioVCoTKsMVvmmTkaQp/BDJfjR6FcYDuTi4m90+06Q=; b=y4IcOOhsRyUczdayFy0OqDnu1JYygfyEkxQfEKIp36c+PYXl37+ho9uTk8DTqOwMey BiROkl4iccaTtFkRKN7c2zPu6QuNG3u0i8/fMSucYzkTcCuneW68pRq5TnY2DhO6WTA2 Jd3Q9ErjexanV1WxCXZ2N74Ywq4A4ETCpcvb7nsr5VdtIK5uv1mFBVsyyr3ZYacEL/7y px0q8dznC8CiCMxQzao7cwXkNXnI9ZTxexwQeSFp1ybfzZusNQGssLbmj2PxkBTZ3+sJ 4nIH/GZGrWq3M/lMcEwy1cckAnVCf+KlOmZ3iguECdkSIYWvOMXsP7w7LaAr885uoj3c LxKw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=monom.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n6si33301521pgs.333.2019.07.29.08.40.57; Mon, 29 Jul 2019 08:40:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=monom.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388128AbfG2Pk4 (ORCPT + 29 others); Mon, 29 Jul 2019 11:40:56 -0400 Received: from mail.monom.org ([188.138.9.77]:49936 "EHLO mail.monom.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388096AbfG2Pky (ORCPT ); Mon, 29 Jul 2019 11:40:54 -0400 Received: from mail.monom.org (localhost [127.0.0.1]) by filter.mynetwork.local (Postfix) with ESMTP id 8A657500767; Mon, 29 Jul 2019 17:40:51 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.monom.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (b9168f76.cgn.dg-w.de [185.22.143.118]) by mail.monom.org (Postfix) with ESMTPSA id 56685500959; Mon, 29 Jul 2019 17:40:51 +0200 (CEST) From: Daniel Wagner To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg KH , Jon Hunter Subject: [PATCH 4.4 1/2] vmstat: Remove BUG_ON from vmstat_update Date: Mon, 29 Jul 2019 17:40:45 +0200 Message-Id: <20190729154046.8824-2-wagi@monom.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190729154046.8824-1-wagi@monom.org> References: <20190729154046.8824-1-wagi@monom.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Lameter [ Upstream commit 587198ba5206cdf0d30855f7361af950a4172cd6 ] If we detect that there is nothing to do just set the flag and do not check if it was already set before. Races really do not matter. If the flag is set by any code then the shepherd will start dealing with the situation and reenable the vmstat workers when necessary again. Since commit 0eb77e988032 ("vmstat: make vmstat_updater deferrable again and shut down on idle") quiet_vmstat might update cpu_stat_off and mark a particular cpu to be handled by vmstat_shepherd. This might trigger a VM_BUG_ON in vmstat_update because the work item might have been sleeping during the idle period and see the cpu_stat_off updated after the wake up. The VM_BUG_ON is therefore misleading and no more appropriate. Moreover it doesn't really suite any protection from real bugs because vmstat_shepherd will simply reschedule the vmstat_work anytime it sees a particular cpu set or vmstat_update would do the same from the worker context directly. Even when the two would race the result wouldn't be incorrect as the counters update is fully idempotent. Reported-by: Sasha Levin Signed-off-by: Christoph Lameter Acked-by: Michal Hocko Cc: Johannes Weiner Cc: Tetsuo Handa Cc: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Daniel Wagner --- mm/vmstat.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.20.1 diff --git a/mm/vmstat.c b/mm/vmstat.c index dd0a13013cb4..233045057a30 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1407,17 +1407,7 @@ static void vmstat_update(struct work_struct *w) * Defer the checking for differentials to the * shepherd thread on a different processor. */ - int r; - /* - * Shepherd work thread does not race since it never - * changes the bit if its zero but the cpu - * online / off line code may race if - * worker threads are still allowed during - * shutdown / startup. - */ - r = cpumask_test_and_set_cpu(smp_processor_id(), - cpu_stat_off); - VM_BUG_ON(r); + cpumask_set_cpu(smp_processor_id(), cpu_stat_off); } }