Message ID | 20200710112417.25116-2-khorenko@virtuozzo.com |
---|---|
State | New |
Series | "Series without cover letter" |
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); Fri, 10 Jul 2020 13:29:19 +0200 (CEST) Received: by 2002:a5e:a91a:0:0:0:0:0 with SMTP id c26csp531436iod; Fri, 10 Jul 2020 04:24:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGkcyFoUqxkatvXizo+71yln3QHMvKULuo1tCfMJLHVmVZfDRrqPm/2PATOnT9EMzJ5uHK X-Received: by 2002:a05:6512:3082:: with SMTP id z2mr30047665lfd.78.1594380286938; Fri, 10 Jul 2020 04:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594380286; cv=none; d=google.com; s=arc-20160816; b=eA+6ClKA2vCyxe97+C1Ppv4W/dqpjMhNJ0y/peDA9Kbn8PTRSvo0brv3PYFOCsPohv SGe9cOP04UIyMyXiuxN9+ZEAuf062ZQAf4lw2BS+BARXIBwCDzz7Z3jpTw8JQRAeZFTR druYf9LoBRWJl8LviGMSfC8iJusST1420Xji5mR32EYM34yfuQGeh2XipGWIP1rETalY Nd21u1qRTMmaP2iVm0UCDO3iols+1kLa7QfYUoS/ZyfEk4CXI2OIZDq0OGUY6xN844Ve WHvwk954PudBCJuEHInByb7QcCTcM7F1FcsIhXj+hbxL4iKxPDUDCnQCmgqfmmBIBLEq LOKA== 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=xEJ5fDVbxLi1eoikGdgTs2nV/vy7EIYaaoomDYrlCJI=; b=eiD+wiHYN9zf3lCb6+RUadW0Th/Y8ZOYWMZ4I5KxuBrS8s78hI10v+fbA+4E8a+B4Q ul0XACDnmmi6X8n7S0Te97bcIc/+jJ2R7i397IFO8sgn7U8CABufg7D8x+12ikdxZLDo Fi+mUOLoo2+IY8B94mkpT2je86HMBn6oEzxlOmrSH7zq8EGvYOHIhyuMkq/vrxfxPOZn CrfrXNGu+OshYexWOaycVILubEtEOduTca45DE9N69I0CIej+DZimBGb5NdKSOnvRXbP 7gKTgzue15CWZDJU9Kyl/68IRmXlaGt76pcjlEXwsLkeJW0OQQXcHX9ptRxqkk/LbN+8 su/w== 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 h18si3284044ljl.207.2020.07.10.04.24.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jul 2020 04:24:46 -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 06ABOHKx023440; Fri, 10 Jul 2020 14:24:20 +0300 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2105.outbound.protection.outlook.com [104.47.18.105]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 06ABOF7o023434 for <devel@openvz.org>; Fri, 10 Jul 2020 14:24:15 +0300 Received: from DB7PR02CA0020.eurprd02.prod.outlook.com (2603:10a6:10:52::33) by AM6PR08MB4819.eurprd08.prod.outlook.com (2603:10a6:20b:c7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21; Fri, 10 Jul 2020 11:24:19 +0000 Received: from DB5EUR01FT013.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:52:cafe::52) by DB7PR02CA0020.outlook.office365.com (2603:10a6:10:52::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Fri, 10 Jul 2020 11:24:19 +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=relay3.sw.ru; Received: from relay3.sw.ru (185.231.240.75) by DB5EUR01FT013.mail.protection.outlook.com (10.152.4.239) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Fri, 10 Jul 2020 11:24:18 +0000 Received: from [10.94.4.83] (helo=finist-ce7.sw.ru) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from <khorenko@virtuozzo.com>) id 1jtr8Y-0004zQ-5C; Fri, 10 Jul 2020 14:24:14 +0300 From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Vasily Averin <vvs@virtuozzo.com>, Andrey Ryabinin <aryabinin@virtuozzo.com> Date: Fri, 10 Jul 2020 14:24:17 +0300 Message-Id: <20200710112417.25116-2-khorenko@virtuozzo.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20200710112417.25116-1-khorenko@virtuozzo.com> References: <20200710112417.25116-1-khorenko@virtuozzo.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:185.231.240.75; CTRY:RU; LANG:en; SCL:-1; SRV:; IPV:CAL; SFV:SKN; H:relay3.sw.ru; PTR:relay.sw.ru; CAT:NONE; SFTY:; SFS:; DIR:INB; SFP:; X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 0cab165c-bc3c-487f-892f-08d824c3c972 X-MS-TrafficTypeDiagnostic: AM6PR08MB4819: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?581l2XY7n1/No4LhADQx+O+TdveP1s3pKPT2iY8VOPiRs4tf7Z3ND881kJmq?= =?us-ascii?Q?gJ1RZyV1SbWlkIN6nRls5RqS9KsynjnJjiUZSnA2lfyGuWL7mJ3e46vjDQVd?= =?us-ascii?Q?tjelFiZSyO9Hs5V2XzFC8L90ZMY2nb3WlYCMiTINM9DuKvmlqhpAxcq9VgMu?= =?us-ascii?Q?gQE0YCgWZJjQ5nRN01v2RlNGjupV9EHR5489tUP40C1a6i20q7j4Xb+jzL/h?= =?us-ascii?Q?sl+pKl6wnXjfJn1rq3E4erCfloYuN+anZbeQ6dEljroG41+hu0rm9PWEcZda?= =?us-ascii?Q?2xMVhV4C0O2MmQMoQtkTNMPNURZmb9uLN/fWI+1FXk6BXftmuFlzFoLIJdnQ?= =?us-ascii?Q?XmgRhZZwkdwjpzeOAl5WBNguKj2HpEXFLunVRwt7i+QOdqOwSJcnnuxwDKR9?= =?us-ascii?Q?v4d0winfWSJoXzOFBqenn/dedbCMsiQZNzJ+a2DTxSjtM4JvR/Pi1bhJzD00?= =?us-ascii?Q?anwKuXs1YuMUbeu23fQteGg+PL8MMUihfND/VczgVgRoWNPh5MWW7k055HkK?= =?us-ascii?Q?ej9CnwurcBgNd5R23CTnFfaWwu7npQqJcOuxhSUt9SwjiPjl6C8jGxc2+OXR?= =?us-ascii?Q?OSkSiDCx7K/eUfmUtQy6Kz/uebKdhPhSK8KaVhoCdlQ+TOFkpPdLGDHiIp79?= =?us-ascii?Q?/NG0jtaoYXlhZ1nAS4qxFRZBNDk5amRDxsW9DBPB7nBoEz1rUIrEoOLgHAlc?= =?us-ascii?Q?aa4KwDMCvt6Etcb+nadDxqoZnNT0Jug1M4K73mNQQ/T4BFkO34TTXq3hMPyA?= =?us-ascii?Q?HQNOqxDlfJTiyDRh1JEvFJW5pCCcc/iTPicvFnU/B9Qh3529k7iQ+Om2oewg?= =?us-ascii?Q?KyP1d1EtfuZmkLPd4SEpqwuw6x2WaeIbFPd2syrug0V0Ar8lpTFldkG0s0vs?= =?us-ascii?Q?eU+vP56FZnoVJvJ0kpEBDMkskvV+8qe2VgfdZvrChBV7om5BXzo3zxHU/tg0?= =?us-ascii?Q?AslGNPqSN+HoJDQPH19WR1ertyEoMdVaHbwZN8HM97DLjZPznVV47SjKqBgb?= =?us-ascii?Q?RLLZJevU7Dt5DHxDVsj1ZJH1hHUwhw4vIu4YVY7h73itFC3TE4Ll7w9/xsT3?= =?us-ascii?Q?58o/q9Bt6KLwf440QGlohW29h5c5VK7qxwjWSR0GC/NBYSrHBYstxBjymvlb?= =?us-ascii?Q?okypapCRF/iakOLl3h75Iq4dlmJPzmBpU2KmZAEyOaAdezwgkF6v5qNMKmZg?= =?us-ascii?Q?9ST+XXWkYh/yexMn2znHtJaaH2CDZPBiWoVyLQ=3D=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2020 11:24:18.9714 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0cab165c-bc3c-487f-892f-08d824c3c972 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=[relay3.sw.ru] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT013.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4819 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT013.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AM6PR08MB4819.eurprd08.prod.outlook.com Cc: OpenVZ devel list <devel@openvz.org> Subject: [Devel] [PATCH RH7 2/2] memcg, bc/vm_pages.c: drop accidental duplicated counter read 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/mm/memcontrol.c b/mm/memcontrol.c index 8cd925d0b2078..62370e72b99b6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4672,8 +4672,6 @@ void mem_cgroup_fill_sysinfo(struct mem_cgroup *memcg, struct sysinfo *si) /* CT can report totalswap > SWAP available on Host */ si->totalswap = memcg->memsw.limit - memcg->memory.limit; - used = page_counter_read(&memcg->memory); - if (swaped > si->totalswap) { si->freeswap = 0; used += swaped - si->totalswap;
On 7/10/20 2:24 PM, Konstantin Khorenko wrote: > Nothing bad happens due to this, just a redundant counter read, > drop it. > > Fixes: 770906b27920d ("memcg, bc/vm_pages.c: account some swapped memory > as used in CT in /proc/meminfo") > > Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com> Reviewed-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Nothing bad happens due to this, just a redundant counter read, drop it. Fixes: 770906b27920d ("memcg, bc/vm_pages.c: account some swapped memory as used in CT in /proc/meminfo") Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com> --- mm/memcontrol.c | 2 -- 1 file changed, 2 deletions(-)