From patchwork Wed Apr 19 03:07:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifeng Xu X-Patchwork-Id: 85160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp71354vqo; Tue, 18 Apr 2023 20:36:18 -0700 (PDT) X-Google-Smtp-Source: AKy350bUcan6RNEpuGxdTJ14d7yNTtGzcuMpdHgA8NOioa3UaQexn5e+dDELOnpGbkHIn6Lgvmj8 X-Received: by 2002:a05:6a00:1821:b0:63d:408a:e14 with SMTP id y33-20020a056a00182100b0063d408a0e14mr2418304pfa.4.1681875378178; Tue, 18 Apr 2023 20:36:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681875378; cv=none; d=google.com; s=arc-20160816; b=tvlv2ADzn6X4XNcfj/ol+NVhOWUXyVH22Ltqc8x2JTgTvpqZGgMvJCD6ZjPDOKjMYZ TFjl+CpNMIMNa9cJOGnvY74bwoRuyKtEROwk/DGjpRiLGAoCm2VztAniQ0xzdvEf/ZnG 4+LYeDu2JHx5809AaIT+RRFPDe/l7FG7VjGAeTcY+9lEAtobWh8OBbzei3jcPD+0+U5K eSMQDOJfL5cvODy+PUzjhQ3ZeIVXML3PhQ46bTOne5M6keD9oxhcrQWqWHoa3H3FJfUn YNTCajNXxOSnGvm67d78PVD4ky+iWQg1lZBVd11dozhxZPruOMgEd6OChqHsuuMGt4tC /dYg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nviNXZ8MpNGnswY2Ey+JPiFyvr7UX/7DG9RC/8jr/gg=; b=RE5lc2JFrwJpoS5h9a9zYpFvEpuX2JUbndR9Pqb4YjwsbHGKIDJCbKAOvFflLvsBlr HvsQqFH3l+8NYigWHR1nGIy1B/ppR5ZQvA39t23uSNLtwl6aDeKDFnenA0utja1SeJIT V5dq4JTYiLBRZ77QSbSpaKQ7LVgOyL/VKW7kDj9UspatZn9vxm1iqWRqPXz3HEsLIsDY vp0LsLXejLsb0e7j1mcW0c9NhLWDBrDUaEQw+i4fT7q1WKt4nWCNCWyXPQu4B89Q3NOd jGVyBvhm2CtgxaNS/qjK1ZJeSuN0s9KnIA5Pxkf4GW80n3gtShH+1ofDDQaZHVSWRiTG 2U/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=BdWMlTLA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f16-20020a63f110000000b00520a879b9cesi529726pgi.3.2023.04.18.20.36.03; Tue, 18 Apr 2023 20:36:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=BdWMlTLA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231308AbjDSDII (ORCPT + 99 others); Tue, 18 Apr 2023 23:08:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229688AbjDSDIG (ORCPT ); Tue, 18 Apr 2023 23:08:06 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89A1846BA for ; Tue, 18 Apr 2023 20:08:04 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id p8so28310536plk.9 for ; Tue, 18 Apr 2023 20:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1681873684; x=1684465684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nviNXZ8MpNGnswY2Ey+JPiFyvr7UX/7DG9RC/8jr/gg=; b=BdWMlTLAc9ygx2qd6sNmSkvG3hOuewMi1A6ltCqDBjeKwTiYoAjw31KLUXL4Um80zZ mMQpqvccs60Ix14cht+Y1dTzSmescFdlLdpVm5DtqpGGFf4WdMUjHT2/mYgvWVk2g/Ru xj+Uucw7XaIqG4bigweo2Fg1e76nUm/46kIEfQeIISYCI2pm5Ce1Q8RslNpStIE3S9FC kcONJwqS5ngxQMH+UCa84o2maXLDoBW3O3QiscYsUmr1+JLTTyfsPVTMS2+vvlzRIeWt R0tp3yOdznk0dSCAN5Pxl8T6Pf86sHJdaCDBb2dT9BNZMoQNhNQEOnOqEtp71GjkdLgU AW/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681873684; x=1684465684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nviNXZ8MpNGnswY2Ey+JPiFyvr7UX/7DG9RC/8jr/gg=; b=PSetQe01oYXdGS2n4uVz9hl1s8OXxdu8hoN0SNUta25HkJguqv6blb1e4JMyo6PQWo wgmeRPgpysVg1O6Geo/pXpD/3agPgNsudWwv60Y/v6kWrFWbwucu9nC9XlyUpE2AKQFZ Q6+YdEmXgDgn/v9JU1Tqu5LaVr+lN5l6UvLowhMHdKELpDOafUFGHUeYKn1hZiYnZKvk BhumXM1EJK6kAQOKTxxyoqir0KQYrxZkirL7PPiULqOLK9v5U85trmPWDz8Vx741dbVm TUUebwy0o1sSDLdBkTikS9AkQf5A0O006Q+4z/dO2/ZfYD2Se3o2nqmS+ESY+LxNifKO YLHQ== X-Gm-Message-State: AAQBX9e4kEPpmdWpHG3Eui9tEESszcPqO2wNaW6nXorY48OKmDxs9p4u WkbvXURS9pve1YVB1FDIg3LMiw== X-Received: by 2002:a05:6a20:1612:b0:f0:f4cf:fcf0 with SMTP id l18-20020a056a20161200b000f0f4cffcf0mr2158017pzj.11.1681873683959; Tue, 18 Apr 2023 20:08:03 -0700 (PDT) Received: from ubuntu-haifeng.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id n13-20020aa7904d000000b00639a1f7b54fsm9900150pfo.60.2023.04.18.20.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 20:08:03 -0700 (PDT) From: Haifeng Xu To: mhocko@suse.com Cc: hannes@cmpxchg.org, roman.gushchin@linux.dev, shakeelb@google.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH v2 1/2] memcg, oom: remove unnecessary check in mem_cgroup_oom_synchronize() Date: Wed, 19 Apr 2023 03:07:38 +0000 Message-Id: <20230419030739.115845-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763574156532324487?= X-GMAIL-MSGID: =?utf-8?q?1763574156532324487?= mem_cgroup_oom_synchronize() is only used when the memcg oom handling is handed over to the edge of the #PF path. Since commit 29ef680ae7c2 ("memcg, oom: move out_of_memory back to the charge path") this is the case only when the kernel memcg oom killer is disabled (current->memcg_in_oom is only set if memcg->oom_kill_disable). Therefore a check for oom_kill_disable in mem_cgroup_oom_synchronize() is not required. Signed-off-by: Haifeng Xu Suggested-by: Michal Hocko Acked-by: Michal Hocko --- v2: split original into two and improve patch description --- mm/memcontrol.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5abffe6f8389..fbf4d2bb1003 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1999,16 +1999,9 @@ bool mem_cgroup_oom_synchronize(bool handle) if (locked) mem_cgroup_oom_notify(memcg); - if (locked && !memcg->oom_kill_disable) { - mem_cgroup_unmark_under_oom(memcg); - finish_wait(&memcg_oom_waitq, &owait.wait); - mem_cgroup_out_of_memory(memcg, current->memcg_oom_gfp_mask, - current->memcg_oom_order); - } else { - schedule(); - mem_cgroup_unmark_under_oom(memcg); - finish_wait(&memcg_oom_waitq, &owait.wait); - } + schedule(); + mem_cgroup_unmark_under_oom(memcg); + finish_wait(&memcg_oom_waitq, &owait.wait); if (locked) { mem_cgroup_oom_unlock(memcg); From patchwork Wed Apr 19 03:07:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifeng Xu X-Patchwork-Id: 85159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp70913vqo; Tue, 18 Apr 2023 20:34:52 -0700 (PDT) X-Google-Smtp-Source: AKy350bz1aBp8d0Uhxmgzp3cd5jRL6DVsdvL6VZgb9ZBtk/7MzyXhGm1uataIAm8AQw2XoSo6AFW X-Received: by 2002:a17:902:b111:b0:1a6:61ad:9d03 with SMTP id q17-20020a170902b11100b001a661ad9d03mr3609721plr.65.1681875292512; Tue, 18 Apr 2023 20:34:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681875292; cv=none; d=google.com; s=arc-20160816; b=guJGe6ktLQ9d6y1la580A1rx2kvIA+IvytI3Xe0Ki5zGbnAKKP8/Pr1GZh/xIq6GeN j8z7saTILObCm3o8U/wNte40vJHA1vLolu4cirHZLIVwjEqycFRMvhMvLm7sLFKYqtEx raBrMjAKPEPNuNo6iOmDkKQDKDkjwV8Itj6cHz+orDOFgEdUjLHaDSmeCF3EcxpsuON6 Pn/c5cMjWhCZDDgbDZ3h9orTteOROcxUDLH4U1HrO/2gteZGWxKrdLyVC1g5eXgEfnzP Ly8EoDdeJy1mLRwNeAcn3nhbyo+klMyS34Usk8oAO5GcBW2Fj1GGj6yRn+soT2Yi91QR dJmQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tn1RBm/Mor5mDf6XpgrvR7fGB9zm/SepD40w5P+k+Fo=; b=h1uLyLyxBNTzpiLApEV5fKnBTTrcxjY0Zb1nZfbekdCfYYlPlgmYUpKOdA6A/28kll KOw/caET+hC/JzAS8ST0kh45eycr1Sw922p7LrMR//kJsd8ijKOCWS5pYaajiTL4zu3J e6WdKSA6RSj48KczyqNwqQbn/L8w0LfzIqIeMEuRdIWtU8TXbeCmaAd2cUwzdENLzUKA pVP5IhS71s3czCsRCaEqbs4/0lXtOtc4IlcqFKNYuYXNvV1HUWokU9M8+DrFFrjd/pZc egqvcgEZgR3mmck+a1QfNlgD0p3Te4AT3EX9uHKsaFYZS0PrPCQWew+FIZchC0v3vYJL 5gAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=CFDTP8Up; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v5-20020a632f05000000b0050f83aa181esi15352774pgv.698.2023.04.18.20.34.37; Tue, 18 Apr 2023 20:34:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=CFDTP8Up; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231348AbjDSDIa (ORCPT + 99 others); Tue, 18 Apr 2023 23:08:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231538AbjDSDI1 (ORCPT ); Tue, 18 Apr 2023 23:08:27 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 787187EC2 for ; Tue, 18 Apr 2023 20:08:20 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-63b7096e2e4so2223213b3a.2 for ; Tue, 18 Apr 2023 20:08:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1681873700; x=1684465700; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tn1RBm/Mor5mDf6XpgrvR7fGB9zm/SepD40w5P+k+Fo=; b=CFDTP8UpamOjSkf6uSwJOpfoEuiWUQFQkpRmx0iuOyVqPiTd0RG1EizK+6m/2ENflQ zuvXS1EccxoMvzutlUsLWIQ0GKWF+zHw9ZIz6D87a19z3vrERVD//Dz+e9Ree6yCZe+9 S3TUoEPer+uzdJo+Bo2qfHlWJupVYHAsxFVCZfTd1AN5d6BI0RDJasSzG/Crc6HuLTz5 EGpIFM+AgVt2olBdg0YR1L+tuK/zLXOFQqCSaKEyQgHDI/bnyoDBvXAUWFbCL+g3CYv8 bxiDHUoy6ZcX98Y78K1+cx+BOoPYoNQ4tNlSu/eyRlIUpgNJOPylspmFfjaS8EL3/4jN IKQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681873700; x=1684465700; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tn1RBm/Mor5mDf6XpgrvR7fGB9zm/SepD40w5P+k+Fo=; b=H9h60BJn5/P/C0dE/asgind3ZyK/N63o8zIoMjt7q56U1KAFzbynPTh4Dgj7WErRpb Z9d2kFfTqYME0xxeXT7spX2+c6YCvHDusWxcVlDL/5Dfr4U7It+7b3ntF55FrdYe3QuW P19XNSwPrVEdDluZOvbsx4p/9pa2/bmMHxzvj+u9NBc2AGzLyiDevA91/csxmnVk47cC 2vgTRTk0mnwemKCRkATxf5+i2WwhE2hplQwWXBFYPhoV6JNIYAnS0u++z1F926I2uJBn tUpX3lhBbn8skfWMWPZZt6Hdr71QiqKzl4611IeU8EyGCuSYOOT5TPL09I02C2pQlPsc WIWg== X-Gm-Message-State: AAQBX9fmfzkXR1NGhLXG9PczAVHf9UrQXe1ONROaCikTCJmm54asNL8E ShwM7p/Z7vLpCJmZ8cwoa1ojjw== X-Received: by 2002:a05:6a00:ad0:b0:63d:2333:84e6 with SMTP id c16-20020a056a000ad000b0063d233384e6mr2130939pfl.33.1681873699794; Tue, 18 Apr 2023 20:08:19 -0700 (PDT) Received: from ubuntu-haifeng.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id n13-20020aa7904d000000b00639a1f7b54fsm9900150pfo.60.2023.04.18.20.08.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 20:08:19 -0700 (PDT) From: Haifeng Xu To: mhocko@suse.com Cc: hannes@cmpxchg.org, roman.gushchin@linux.dev, shakeelb@google.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH v2 2/2] memcg, oom: remove explicit wakeup in mem_cgroup_oom_synchronize() Date: Wed, 19 Apr 2023 03:07:39 +0000 Message-Id: <20230419030739.115845-2-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763574066679055719?= X-GMAIL-MSGID: =?utf-8?q?1763574066679055719?= Before commit 29ef680ae7c2 ("memcg, oom: move out_of_memory back to the charge path"), all memcg oom killers were delayed to page fault path. And the explicit wakeup is used in this case: thread A: ... if (locked) { // complete oom-kill, hold the lock mem_cgroup_oom_unlock(memcg); ... } ... thread B: ... if (locked && !memcg->oom_kill_disable) { ... } else { schedule(); // can't acquire the lock ... } ... The reason is that thread A kicks off the OOM-killer, which leads to wakeups from the uncharges of the exiting task. But thread B is not guaranteed to see them if it enters the OOM path after the OOM kills but before thread A releases the lock. Now only oom_kill_disable case is handled from the #PF path. In that case it is userspace to trigger the wake up not the #PF path itself. All potential paths to free some charges are responsible to call memcg_oom_recover() , so the explicit wakeup is not needed in the mem_cgroup_oom_synchronize() path which doesn't release any memory itself. Signed-off-by: Haifeng Xu Suggested-by: Michal Hocko Acked-by: Michal Hocko --- v2: split original into two and improve patch description --- mm/memcontrol.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index fbf4d2bb1003..710ce3e7824f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2003,15 +2003,8 @@ bool mem_cgroup_oom_synchronize(bool handle) mem_cgroup_unmark_under_oom(memcg); finish_wait(&memcg_oom_waitq, &owait.wait); - if (locked) { + if (locked) mem_cgroup_oom_unlock(memcg); - /* - * There is no guarantee that an OOM-lock contender - * sees the wakeups triggered by the OOM kill - * uncharges. Wake any sleepers explicitly. - */ - memcg_oom_recover(memcg); - } cleanup: current->memcg_in_oom = NULL; css_put(&memcg->css);