From patchwork Tue Oct 17 20:00:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 10012797 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3D0B060211 for ; Tue, 17 Oct 2017 20:00:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29C5B289FF for ; Tue, 17 Oct 2017 20:00:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18EFC28A13; Tue, 17 Oct 2017 20:00:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78EA428A12 for ; Tue, 17 Oct 2017 20:00:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759952AbdJQUAK (ORCPT ); Tue, 17 Oct 2017 16:00:10 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:56786 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756623AbdJQUAJ (ORCPT ); Tue, 17 Oct 2017 16:00:09 -0400 Received: by mail-qk0-f194.google.com with SMTP id l194so3588865qke.13; Tue, 17 Oct 2017 13:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:reply-to:organization; bh=mptAr8iokdMP1RvH3i/u6Ikm/cDJ3BnfI2B3NvJnNfg=; b=sLmi3PJUlwHJGXQJyirvnRI7ViQQ/h5uIzqAswa4jyKSnTF6xXvNsWDIt4ZEmiYcL2 CSpjBj96fsunPGGHd4n94LzL5Sh1xGtNxWwchj5DMeH6KTHhldPWKXBfl7PkA2BnP4F4 O5CdE6QD78sl5CDfK5I9A5c5BHinU1MLb9G3kC54gWTKbXW2qpe0bRmB2yKYoLIq6sSo kfDL3AmvTeb0Yx6XUWC4wjUocdBsh22Ena9ZHKuOOuFJ2FyPghvzgTgX3h8VCBq57L1d LjRy9fniY1QGxt83EG5Ifs9GYZdPF59EXK9lFT3PN0ED9UJKHKQqiXfbbSXB9Wi9cbRh bDBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to:organization; bh=mptAr8iokdMP1RvH3i/u6Ikm/cDJ3BnfI2B3NvJnNfg=; b=qAhGmtmjmtV2LOVqPvMXoqWwV13RZgqgr0KrP8wllrqecn39JmaL3cDBKkRzJ1RdYn 9sAhHB4yTTS+hGopL+dn95MyV2hdWeJ4c1pkWLTkQGu2qUZCqdZhsrQEyV86OoJ1VEFR T1gwH1WnF3iIpPGtzoYBulVH184OuRrhTLOYHqn7g42fnco2K0vNv4rGnCjQPW5uwA7j TKOlFOxLqyyeNWOhD3x27Z3HHY4ZKRs1yVNpqFr9qiWB1ttEFBXIYmbv82kjf30RY4dU iYWTM2lz4FRXx0pOQkIEGmvRPCyW7uykCzYKRPbVnuBuLRj3S+cR9t6DfOjpMsyxAy8t H2AA== X-Gm-Message-State: AMCzsaWR8emwMQoqzjviNOIqGY/wDybAJNCGhBT3os6vrfDWfF+fJ7fQ MP0zp4OUUvq5H1UIiwuvWrQ= X-Google-Smtp-Source: ABhQp+TOIUWjzx/D58O9T0v8XcJLZDJxv9f/XR0HPIJBP/eALcoPJq0JF1ETFuogi6EkzlrPgbzJ9A== X-Received: by 10.55.169.87 with SMTP id s84mr18634223qke.305.1508270408468; Tue, 17 Oct 2017 13:00:08 -0700 (PDT) Received: from localhost.localdomain (pool-173-48-65-169.bstnma.fios.verizon.net. [173.48.65.169]) by smtp.gmail.com with ESMTPSA id j19sm6733223qkh.38.2017.10.17.13.00.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Oct 2017 13:00:08 -0700 (PDT) From: Len Brown To: rjw@rjwysocki.net Cc: linux-pm@vger.kernel.org, Len Brown , stable@vger.kernel.org Subject: [PATCH 1/1] Revert "tools/power turbostat: stop migrating, unless '-m'" Date: Tue, 17 Oct 2017 16:00:02 -0400 Message-Id: X-Mailer: git-send-email 2.14.0-rc0 Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Len Brown This reverts commit c91fc8519d87715a3a173475ea3778794c139996. That change caused a C6 and PC6 residency regression on large idle systems. Users also complained about new output indicating jitter: turbostat: cpu6 jitter 3794 9142 Signed-off-by: Len Brown Cc: # v4.13 --- tools/power/x86/turbostat/turbostat.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 0dafba2c1e7d..bd9c6b31a504 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -92,7 +92,6 @@ unsigned int do_ring_perf_limit_reasons; unsigned int crystal_hz; unsigned long long tsc_hz; int base_cpu; -int do_migrate; double discover_bclk(unsigned int family, unsigned int model); unsigned int has_hwp; /* IA32_PM_ENABLE, IA32_HWP_CAPABILITIES */ /* IA32_HWP_REQUEST, IA32_HWP_STATUS */ @@ -303,9 +302,6 @@ int for_all_cpus(int (func)(struct thread_data *, struct core_data *, struct pkg int cpu_migrate(int cpu) { - if (!do_migrate) - return 0; - CPU_ZERO_S(cpu_affinity_setsize, cpu_affinity_set); CPU_SET_S(cpu, cpu_affinity_setsize, cpu_affinity_set); if (sched_setaffinity(0, cpu_affinity_setsize, cpu_affinity_set) == -1) @@ -5007,7 +5003,6 @@ void cmdline(int argc, char **argv) {"hide", required_argument, 0, 'H'}, // meh, -h taken by --help {"Joules", no_argument, 0, 'J'}, {"list", no_argument, 0, 'l'}, - {"migrate", no_argument, 0, 'm'}, {"out", required_argument, 0, 'o'}, {"quiet", no_argument, 0, 'q'}, {"show", required_argument, 0, 's'}, @@ -5019,7 +5014,7 @@ void cmdline(int argc, char **argv) progname = argv[0]; - while ((opt = getopt_long_only(argc, argv, "+C:c:Ddhi:Jmo:qST:v", + while ((opt = getopt_long_only(argc, argv, "+C:c:Ddhi:JM:m:o:qST:v", long_options, &option_index)) != -1) { switch (opt) { case 'a': @@ -5062,9 +5057,6 @@ void cmdline(int argc, char **argv) list_header_only++; quiet++; break; - case 'm': - do_migrate = 1; - break; case 'o': outf = fopen_or_die(optarg, "w"); break;