Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3575642pxv; Mon, 19 Jul 2021 03:48:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjVpPexlj3fXpA2VQyyiIaIjisqsF/VlZsWoU+qODMsUnMx5F5722UWfYRyOGgcxJWtbTA X-Received: by 2002:a02:94e5:: with SMTP id x92mr21263154jah.107.1626691679889; Mon, 19 Jul 2021 03:47:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626691679; cv=none; d=google.com; s=arc-20160816; b=E1IMHJnMNUV84eQyCIr++4bPR7yfAsleDhGpi5/EEGBOA+E+plzPHCytKR30EZ29Q9 0abh7biGPP2WLYY+z2awyf+L5wxGZcidayd34GCXZHyIx3FrdU+UsPdXoC9+AfaWbRpZ RXpOdvsp2m1B1/9K2fa/PNUhzmIeZQQaxtHRBOl1jo7CFExN/c54jep2MHeo6aVTMyZN /9NvFfp7UDchNptWLWyCVpv5oDC7I+P3PfQFRe6/Ebr1HNpC4Z7fGjBjr8ukAHIPrsea KVcOtdZC2Ulmgc1COs0tdSVaHfR+ZgsqtsWCqO7uKXHEq0aliSpUB7UeDrqgUc+tq8vu vq4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:references:cc :to:subject:from:dkim-signature; bh=fzoFoDaPrywkHjs/msWPtHPRzT9tQ7zWHa/Zk4Ahhwk=; b=Xn2sQWIVAUj+IPkTXyWcTTCLfUidokehWphQuYfRHsLGkCK9zjolvFrJAnDLHNW6QK ohHHJ9hgHqQQD5eG1CxIvlZlqWa5dG5bLFZ6p4UY9fyR43dSqPuQiHnXrs1NhX3F/d0d bRp5A9cOdNaZOC7HZY5OUZP2GvVt4H/NaaU09gp7GwBxrv6qCAOwOhtcBh5+MxBLpUv4 Sni5laXLB1Jq4R3MPr9djiWn85sdAWft++GvNJrwCdqO10kvynAWRK/9HF0TrFnFEfqC 1Z83qt2/uJrQa8hFR47Yhj6g2rQMfKw/vPn/V+eKkesleYB5263vIfNJDgrjW2PVcQVB X1Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=GDt7ZaCx; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n3si21840937ioh.98.2021.07.19.03.47.48; Mon, 19 Jul 2021 03:47:59 -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=@virtuozzo.com header.s=relay header.b=GDt7ZaCx; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236653AbhGSKFa (ORCPT + 99 others); Mon, 19 Jul 2021 06:05:30 -0400 Received: from relay.sw.ru ([185.231.240.75]:44934 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236635AbhGSKFW (ORCPT ); Mon, 19 Jul 2021 06:05:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=Content-Type:MIME-Version:Date:Message-ID:Subject :From; bh=fzoFoDaPrywkHjs/msWPtHPRzT9tQ7zWHa/Zk4Ahhwk=; b=GDt7ZaCxqOlKDHA9VxA rAR9gfIqHe9CxMD2+VQP68kHVIbOmzzoOQuWZswi44FEwhpDFDrDbMb2Z5TKQr53JrcEj81jhKa/y zKJGk2LEfrC4Ievk0xk6plxJ/JlUcg9V9XCW1QjqT2iiz2sP6BygINfOjuJSsMtdBzVoNEc6mDw=; Received: from [10.93.0.56] by relay.sw.ru with esmtp (Exim 4.94.2) (envelope-from ) id 1m5Qme-004Riq-FG; Mon, 19 Jul 2021 13:46:00 +0300 From: Vasily Averin Subject: [PATCH v5 15/16] memcg: enable accounting for tty-related objects To: Andrew Morton Cc: cgroups@vger.kernel.org, Michal Hocko , Shakeel Butt , Johannes Weiner , Vladimir Davydov , Roman Gushchin , Greg Kroah-Hartman , Jiri Slaby , linux-kernel@vger.kernel.org References: Message-ID: Date: Mon, 19 Jul 2021 13:45:59 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At each login the user forces the kernel to create a new terminal and allocate up to ~1Kb memory for the tty-related structures. By default it's allowed to create up to 4096 ptys with 1024 reserve for initial mount namespace only and the settings are controlled by host admin. Though this default is not enough for hosters with thousands of containers per node. Host admin can be forced to increase it up to NR_UNIX98_PTY_MAX = 1<<20. By default container is restricted by pty mount_opt.max = 1024, but admin inside container can change it via remount. As a result, one container can consume almost all allowed ptys and allocate up to 1Gb of unaccounted memory. It is not enough per-se to trigger OOM on host, however anyway, it allows to significantly exceed the assigned memcg limit and leads to troubles on the over-committed node. It makes sense to account for them to restrict the host's memory consumption from inside the memcg-limited container. Signed-off-by: Vasily Averin Acked-by: Greg Kroah-Hartman --- drivers/tty/tty_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 26debec..e787f6f 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -1493,7 +1493,7 @@ void tty_save_termios(struct tty_struct *tty) /* Stash the termios data */ tp = tty->driver->termios[idx]; if (tp == NULL) { - tp = kmalloc(sizeof(*tp), GFP_KERNEL); + tp = kmalloc(sizeof(*tp), GFP_KERNEL_ACCOUNT); if (tp == NULL) return; tty->driver->termios[idx] = tp; @@ -3119,7 +3119,7 @@ struct tty_struct *alloc_tty_struct(struct tty_driver *driver, int idx) { struct tty_struct *tty; - tty = kzalloc(sizeof(*tty), GFP_KERNEL); + tty = kzalloc(sizeof(*tty), GFP_KERNEL_ACCOUNT); if (!tty) return NULL; -- 1.8.3.1