Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3401828pxf; Mon, 22 Mar 2021 05:44:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/hxgKvo5YCX5NCLNI+9av26Jz3BGAyJ04REoQsz/LbT5g4rEzo1X9NBU/zgbqShAySVGu X-Received: by 2002:a05:6402:b48:: with SMTP id bx8mr26232750edb.162.1616417077570; Mon, 22 Mar 2021 05:44:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616417077; cv=none; d=google.com; s=arc-20160816; b=fUNKDl8wxVPpaZSmFBKHYsxgNlKBs4XTyoxTFAg39n0aWTzinQRSG0S1rvvmFZw6WC XITMd9ADfQfXyVMAe/o4VqY2Gxcs9SYG/KQ17wy28jrljloeZ2oBGrLnMQkjXb+Ym1tC jmGUXeegJK6wvXAq5C+v3EM9CNShDTyzoWWXNa6nDaKqwfC3vI3QhA5BMrjGk0S4YHQN ZWC/8vtoApAQYKKCD3/4P2mVlZerErUWjWJIbf9K+fcNm/AIwLAZNulkqIZIcVi/iWBn OUbGdCWu03kLNdf4y9LCZz8u27P3SskSbwwZqA1WtfLbrtoMlcyipAVH61fMZVJs3jA/ 2RhA== 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=8YUqSETIh57DzU1pbg4e6/+wgKtiyQASWHRH5di3HvQ=; b=glrsSARI9nhnic/laH8BnrfD6uSzRi6jUEPck+EQQ4jwF6f++0/AEBV3hTE3YL9Lgr XWxmn1FoDd6uMMiUW+2SKdHgugZ2+skOaVky8fP/GIrGV5BSYqIdOqBaA5VRA5LXSnvs Ijg0BSsE0lbhRraASAcQ8FUKkrRZsNg/kiY+NBgUS3AaBp3HYc4ZBo7KTQc7wGdAjL9h 97JxiO1ALZ955SRQLMM2RvLU0BSPmMPOmxDBRHSPYUksttkNJDk5K54HVnWSqOd7hmEC tf3mf5G2I3f7KpdplpLt0Zww62NYymugxPmdPl//Hz3bq+C+mBdd/a2qWiSAWwunTVxQ 2lZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=S8G73Y42; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bv9si10833588ejb.377.2021.03.22.05.44.14; Mon, 22 Mar 2021 05:44:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=S8G73Y42; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229467AbhCVMk2 (ORCPT + 99 others); Mon, 22 Mar 2021 08:40:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:57450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231761AbhCVMfH (ORCPT ); Mon, 22 Mar 2021 08:35:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4B78760C3D; Mon, 22 Mar 2021 12:35:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616416505; bh=6qDsWRdDrEprk/lwWGwSYooI02SaMRqvmo6OHwXlbKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S8G73Y42g/+c/7r6evDxilszRDVIqK5nnvJcWXv+a88zBSr8s4cW8jfpFTjC1YWQw g217GoEi2N/QpW3MQEatC4dJjBpmMoZkvcz3/kW7ABjv9yCPD87JlK90MSM0TT1aTZ OduHB42sMn/uDZJlES966AxxO4RSv9D69XlkBtF0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sabine Forkel , Heiko Carstens , Gerald Schaefer Subject: [PATCH 5.10 012/157] s390/vtime: fix increased steal time accounting Date: Mon, 22 Mar 2021 13:26:09 +0100 Message-Id: <20210322121934.152669104@linuxfoundation.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210322121933.746237845@linuxfoundation.org> References: <20210322121933.746237845@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gerald Schaefer commit d54cb7d54877d529bc1e0e1f47a3dd082f73add3 upstream. Commit 152e9b8676c6e ("s390/vtime: steal time exponential moving average") inadvertently changed the input value for account_steal_time() from "cputime_to_nsecs(steal)" to just "steal", resulting in broken increased steal time accounting. Fix this by changing it back to "cputime_to_nsecs(steal)". Fixes: 152e9b8676c6e ("s390/vtime: steal time exponential moving average") Cc: # 5.1 Reported-by: Sabine Forkel Reviewed-by: Heiko Carstens Signed-off-by: Gerald Schaefer Signed-off-by: Heiko Carstens Signed-off-by: Greg Kroah-Hartman --- arch/s390/kernel/vtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c @@ -217,7 +217,7 @@ void vtime_flush(struct task_struct *tsk avg_steal = S390_lowcore.avg_steal_timer / 2; if ((s64) steal > 0) { S390_lowcore.steal_timer = 0; - account_steal_time(steal); + account_steal_time(cputime_to_nsecs(steal)); avg_steal += steal; } S390_lowcore.avg_steal_timer = avg_steal;