Message ID | 20200310103150.214003-3-ptikhomirov@virtuozzo.com |
---|---|
State | New |
Series | "fixes to VZ8 required for criu" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from imap.gmail.com [74.125.140.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Sat, 21 Mar 2020 21:40:29 +0100 (CET) Received: by 2002:a5e:9809:0:0:0:0:0 with SMTP id s9csp412717ioj; Tue, 10 Mar 2020 03:33:58 -0700 (PDT) X-Google-Smtp-Source: ADFU+vskXahCoSlI2n/xyDVWSzcBPXKvrdeEgjF6pDuGNtDq/w53rzIgwoSMbBpZn1pbbvEfuZux X-Received: by 2002:a05:6512:6c5:: with SMTP id u5mr12303174lff.130.1583836438261; Tue, 10 Mar 2020 03:33:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583836438; cv=none; d=google.com; s=arc-20160816; b=nmSYiKB5xnpz8fW5onwW/59why21Za5BNxpGmLgA0sav9SxMUwrretd7ORpoZmYAxt 9hQfsof1660RQAOAmwKTfVvVUyQHq4r+SiipD5JJHFt/ThOMo6A99wz8ZN4BZ/MKHneq tUOHLaLUIv6wk3RruPMshamjwfhTkl/BCAbBe7Nb7JRtmnakxbdUuPShfFMepBNHaVwx XDRDpeiGr2I3V+iVfz4SOo9vsKHsCfZ4J6OS2GSL6gb0qISkLtVrPFTlie/Gr8pLmfTw K3wOqRCXzxmw49KvNaKqalrHrnmoz+4zCRjSq9x1qkVbR335en9CKsOr3LeM9hiSYUWF ZRAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from; bh=8qjXYS5dVQzrQSCql+/DT3ZUHK/2SpRiU/UoWnZ0jr0=; b=CuQY5ZzxRpNBQQKIrT3z05kXzyUsr5sLAOqmrj/r92ZgoEDXW0C3Wo04cZcl37MN8o pnuOlqXODDMNCFd46BlUuIOnjdGKTzqOlXohZigqLe/xZIsaA1eA833bcVwGNoNmn9t/ geKcWjwM4CkSOTeDmNY31MDj4PISGvO2StAxUbMh9tOqQfnI3+Yqgm1OufJBmWlShu7y kOJGeZ7/yx8j4gqXNc42a7rhBCjdKgwDo51PsqdTFzwycUa6AtaCQi3lzkqYFZZnA8Ub jGUfIOyL9G2ACbtV3oeH/D36J11fEdHvva53vuWCPMhfZHObkX2L/JHuxUuOhKRkD0nm 72fQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id 131si14502240lfb.186.2020.03.10.03.33.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 03:33:58 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 02AAW6bT024439; Tue, 10 Mar 2020 13:32:06 +0300 Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-mr2fra01on0108.outbound.protection.outlook.com [104.47.25.108]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 02AAVrRX024413 for <devel@openvz.org>; Tue, 10 Mar 2020 13:31:53 +0300 Received: from DB6PR0201CA0033.eurprd02.prod.outlook.com (2603:10a6:4:3f::43) by PR2PR08MB4778.eurprd08.prod.outlook.com (2603:10a6:101:21::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.17; Tue, 10 Mar 2020 10:31:54 +0000 Received: from DB5EUR01FT029.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:3f:cafe::b2) by DB6PR0201CA0033.outlook.office365.com (2603:10a6:4:3f::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.16 via Frontend Transport; Tue, 10 Mar 2020 10:31:54 +0000 Authentication-Results: spf=pass (sender IP is 185.231.240.75) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 185.231.240.75 as permitted sender) receiver=protection.outlook.com; client-ip=185.231.240.75; helo=relay.sw.ru; Received: from relay.sw.ru (185.231.240.75) by DB5EUR01FT029.mail.protection.outlook.com (10.152.4.241) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2793.11 via Frontend Transport; Tue, 10 Mar 2020 10:31:53 +0000 Received: from dhcp-172-16-24-163.sw.ru ([172.16.24.163] helo=snorch.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from <ptikhomirov@virtuozzo.com>) id 1jBcAz-0005wJ-47; Tue, 10 Mar 2020 13:31:53 +0300 From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com> To: Konstantin Khorenko <khorenko@virtuozzo.com> Date: Tue, 10 Mar 2020 13:31:47 +0300 Message-Id: <20200310103150.214003-3-ptikhomirov@virtuozzo.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310103150.214003-1-ptikhomirov@virtuozzo.com> References: <20200310103150.214003-1-ptikhomirov@virtuozzo.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: SFV:SKI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:PR2PR08MB4778; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c0e4443-f866-4390-3784-08d7c4de4072 X-MS-TrafficTypeDiagnostic: PR2PR08MB4778: X-MS-Oob-TLC-OOBClassifiers: OLM:1923; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8RDwsc3FGYMiWRAGz+6Fq/SZVnOq5v+ZULZwV+V6I3vUrZkLCocip5VB6xA5?= =?us-ascii?Q?DF4JJRIG7feu2mz/BihZEiNm6XmUEz6JARvBxm1H/H7sV2V/a2Wap6G+u0OF?= =?us-ascii?Q?tfh1dP2elb6WwhmcHG3aD1a6ZqNHQkFywCMDfYOXgoxFb9WV4prtq9gmpS9J?= =?us-ascii?Q?PrU3He3f8Gf0BMBPftjbiP9Iru9H6RtGONns9a4icxEYr6Ole1mogSotzdFL?= =?us-ascii?Q?JpQGGUZ0Hdhy9GMLNJ/89VGmpCuGG3XQ575pqMqZbOPh3p9skgl8mE70Cn9t?= =?us-ascii?Q?SSV4pcuvxsnVGuxlPknlNjJcOUTK324MF0QKqRg0CvZTP9LXZ5uJZyI6nMnQ?= =?us-ascii?Q?yjXEncMfc9O05yfAwnGkhP+Sbc0/0WeeGqxE04nzxEIFUlfgxQcSM7HyHfeo?= =?us-ascii?Q?nRBXONCQgJh5Jg6BB3kFKo0cg3tZ9pTfm3YW+c94tIYrYUhd16MPblihyTDV?= =?us-ascii?Q?WrzahQxQduGWjZCozxYU1kDEL30bl/okiIPP8ScXOARna5ncPmy7NTKbmo6x?= =?us-ascii?Q?wf6y9sOPKElFjDJLndRxmB4c1zQ25LJ6xgLQVuEQlp0WenJd5vH+Rm5gL9EJ?= =?us-ascii?Q?+HPS4YhWbPsNHbbD5e0mM5GYwb1/lgbWGBqTqQXem4IpLk8f7iOJ6xOyT2xu?= =?us-ascii?Q?Kn30ATS4gwmlCYKM3LSxZLcJIfWsPc1TRrBhpCTwQfkfV22czYIF4oeyz469?= =?us-ascii?Q?jBJteUZ3mKDaCH+RAJ+G/alqA45t+EIjuHktHVqay0nux+Y4OP4EzIr8y74d?= =?us-ascii?Q?p8SjspT6kJ1iefZSYBpWkbEX9Asff5cnT8w7iP2oBMeqznf7xjg+W2UOQBhA?= =?us-ascii?Q?eVRufU00LTo+y5vczfl7FcqAYCLUKI6T/ldND6Y0btMFMBgWG82JMPnnBYXT?= =?us-ascii?Q?gDJNX0CnMCScbXZ79GKhegSWsAaGDOmlJDYJmHLPsl3IWjcsLG/MrqgkLyXH?= =?us-ascii?Q?jcmVNajK5QZwGl/AlCQFkaibAidIsFhWzpkXRX1j+UDKWAhu3BcoFWlUKBqp?= =?us-ascii?Q?DPWyxvbXUAZlvEJJIdJZghuYv4wYd9KrVAq4Hu5N9q1+KgZUaTmngkTXv4cO?= =?us-ascii?Q?3ee+pLjJS6XK4UFoPD4JFZu4LSsVW3WlmJ/LnGQlDfPQ5VVOiV42+SgDhsaQ?= =?us-ascii?Q?+FICKNZuvHrp9lFUZkncy76ztu5fM7Kfp2c5Q9iyf1ebQL2iFTCU0mcZECYX?= =?us-ascii?Q?4e/HMi2KkqlUlJihNBp39tgrOncLxydZ7kvz4YRfyC/fsa2TDaxBVjmgXzB3?= =?us-ascii?Q?2/7e5F/SdaizMemrHoM9cbM2gWZsqrixbWbsBwhhB79TFt66rdIK5N/+C7xV?= =?us-ascii?Q?Zv88zoQ1/KC7F/TyMV99uKHR/9IRj/gJapnUM2mmAmvcWu0U1Dsu5NlTtz74?= =?us-ascii?Q?epmuTycu+zHdoybfWGvG73gvdCVuP/dAqz0XC22yYCXjXcefRnDbD3HfaHyT?= =?us-ascii?Q?1EX4dkQilW/5NEV4pPmpQU0DWSC+BTVT?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2020 10:31:53.9105 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4c0e4443-f866-4390-3784-08d7c4de4072 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[185.231.240.75]; Helo=[relay.sw.ru] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR08MB4778 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT029.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: PR2PR08MB4778.eurprd08.prod.outlook.com Cc: devel@openvz.org Subject: [Devel] [PATCH VZ8 2/5] ve/proc: fix wrong output in do_task_stat() X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/fs/proc/array.c b/fs/proc/array.c index eb6f7f451307..e85d0caa6efa 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -617,7 +617,6 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, seq_put_decimal_ull(m, " ", 0); seq_put_decimal_ull(m, " ", 0); seq_put_decimal_ll(m, " ", task->exit_signal); - seq_put_decimal_ll(m, " ", task_cpu(task)); seq_put_decimal_ll(m, " ", is_super ? task_cpu(task) : task_vcpu_id(task)); seq_put_decimal_ull(m, " ", task->rt_priority); seq_put_decimal_ull(m, " ", task->policy);
Remove printing task_cpu, this part was lost in rebase. Before patch we've showed extra entry in position dependant output of /proc/pid/stat, that made criu go mad. https://jira.sw.ru/browse/PSBM-101289 Fixes: c1b073e09d58 ("ve/proc: Show vcpu in do_task_stat()") Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com> --- fs/proc/array.c | 1 - 1 file changed, 1 deletion(-)