Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp23004rwb; Mon, 26 Sep 2022 08:49:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5e5+0dxbjqIMmjLif/9yIJdNouexntNiNrFQKxfJiPS+kpO64ZoK5SeueNoIGrclf5oXMu X-Received: by 2002:a17:902:dac2:b0:178:4dd9:277e with SMTP id q2-20020a170902dac200b001784dd9277emr22969059plx.107.1664207374282; Mon, 26 Sep 2022 08:49:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664207374; cv=none; d=google.com; s=arc-20160816; b=kaLXB51D9mPYgMKK6CqeThWdarnJIfA0Y4yHRTuaUS5qOj0NWzPPDG89Sj8FmjDByC /sRNMdrwaJ2kQBO1xhlSRZkmAGKq2J2ZCSIWPVDBLG7U+7+6Zui3QhiBR60CDgcHC0Lm T9Hcl43yD5rDjCqlvaW0DWmmwrhHmgcRubCpNUDnkJrhRJdmW4mAe3eKA95/J9yfxPTk H/HkuOBoUJHIgqH4zF1cpgC5qYC5Ol3Etx73gcdt7m9ShHywnftxuYTnvyMiwxzB3oWo g2jlxo4AAYVl3cuLibgZGgHtakUloWqF0y6ao7clsq3JoDMf8D7lA+k66nEUV2Vmlpth ablw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=fVdpPr3f8bRd7B1cM3PWSFoALdvL6AntNtNCVepwQ2Q=; b=cy1lLcRqu3V5UTOrsadznfyKqsm9jRLpBjP7Hl+9On3mA/4lLjtUXDUQMNT4u8lh3w S4xJGYmsSNszpEQWUB0ee0rLAglqJrzKEomVxyVG1ASHX0AKPkUkDnCx8mFUv5ZkmZzf PNO0gbc4U3ofnFGR1ZfUSe8tHJZ29FvWowEa4O1y8jbb9fnFs+6rjz4BmNyxaYgvNetC mzrrm4OQW+r8ZFfC654cv6OgX+rrWXpvV2kpYHK+wCDKILcUfEO+BAi7dBs5AsOUZM6e szfrEsf2PUhvkX1wEj740x1ZEdAPpqREYzWuar2FrOp/cIgcoXCM6DMYdzjdN+bxlQwX kI6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg-org.20210112.gappssmtp.com header.s=20210112 header.b=1d9f5RsB; 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=fail (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l3-20020a170903244300b00179cf094dccsi8435184pls.526.2022.09.26.08.49.22; Mon, 26 Sep 2022 08:49:34 -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=@cmpxchg-org.20210112.gappssmtp.com header.s=20210112 header.b=1d9f5RsB; 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=fail (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235970AbiIZPO4 (ORCPT + 99 others); Mon, 26 Sep 2022 11:14:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236192AbiIZPOP (ORCPT ); Mon, 26 Sep 2022 11:14:15 -0400 Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A91626F7 for ; Mon, 26 Sep 2022 06:57:13 -0700 (PDT) Received: by mail-qk1-x729.google.com with SMTP id y2so4081542qkl.11 for ; Mon, 26 Sep 2022 06:57:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=fVdpPr3f8bRd7B1cM3PWSFoALdvL6AntNtNCVepwQ2Q=; b=1d9f5RsBJxy54KAvlvlDlqBnvfh09snGIaY+6tvR2PwJb8W2/H0yK3jGriNt2JmahM gqWhIFwuh0UZ+C2UumnkbJWyJ6rDK2pKaxW3puzSUzrz7sSlzakzLN6njU4R/pYzJSIB EuFwuwSTppmZFSyDEE7eJVdFYUo9Et/OiqExxX95fifd0xJ6t8vDLsVCXFg8equ7uAz0 iNmSSjeT76pA7UVs2IMoN/Lf9vxrk+ItFKLIw2pndSHR6oVHp4yIhTQmVRrKY9KJhjkm lN8vWWAsrcoQtS+NIFmjYmsrjW0h5S5vkeXtfCCVgzk4o8/Emjt6fufYXfGeZs8kzjQ0 xPZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=fVdpPr3f8bRd7B1cM3PWSFoALdvL6AntNtNCVepwQ2Q=; b=xP1C0NTk3P0z+DYgpdxITQkoWXZwsnZO4/O4gBOMzPha2VDPVtau0KQ2AEu7ztztnK VA/97fdCBwGi0MQTmYCygtoDyKwNhZacs+PzhjL4JrwnTUh7rCFtFo1z7v9+cIq53NUm ncDkFM/ZnkZWLRbQnMgO+AKPGabncNv4Cx+0T88h6kj3chOGDXthCKGpGOtA2xGfMU2V 0buPpQJEbazJ2aLyTcP5Y75ESuNe1XcGrfv5VzeA6NeTyRyH13j2xbJmZZBLrVN7XsWj J9KGVavfJqSKAl/YLHg/edRHK2fdlrgKzPSbCLqPf7dpmQQsdh4ISxafMr4T9b+y9z8n VrVA== X-Gm-Message-State: ACrzQf2bjmczsQi6rrxk+K8wS4a6aljWDTZawKzhObKzLPr3H2FwfNvB cpSVIp0tmgwA1tdweNgKLSKLuA== X-Received: by 2002:a05:620a:24d6:b0:6cd:f96a:35b with SMTP id m22-20020a05620a24d600b006cdf96a035bmr14048238qkn.471.1664200632354; Mon, 26 Sep 2022 06:57:12 -0700 (PDT) Received: from localhost (2603-7000-0c01-2716-9175-2920-760a-79fa.res6.spectrum.com. [2603:7000:c01:2716:9175:2920:760a:79fa]) by smtp.gmail.com with ESMTPSA id l27-20020a37f91b000000b006ce580c2663sm11598075qkj.35.2022.09.26.06.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 06:57:11 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: Shakeel Butt , Michal Hocko , Roman Gushchin , Hugh Dickins , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 0/4] memcg swap fix & cleanups Date: Mon, 26 Sep 2022 09:57:00 -0400 Message-Id: <20220926135704.400818-1-hannes@cmpxchg.org> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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 This is a refresh of older patches that fell through the cracks. Applies on top of mm-unstable. Documentation/admin-guide/cgroup-v1/memory.rst | 4 +- Documentation/admin-guide/kernel-parameters.txt | 6 -- arch/mips/configs/db1xxx_defconfig | 1 - arch/mips/configs/generic_defconfig | 1 - arch/powerpc/configs/powernv_defconfig | 1 - arch/powerpc/configs/pseries_defconfig | 1 - arch/sh/configs/sdk7786_defconfig | 1 - arch/sh/configs/urquell_defconfig | 1 - include/linux/swap.h | 2 +- include/linux/swap_cgroup.h | 4 +- init/Kconfig | 5 -- mm/Makefile | 4 +- mm/memcontrol.c | 79 ++++++++--------------- mm/swap_cgroup.c | 6 ++ tools/testing/selftests/cgroup/config | 1 - 15 files changed, 39 insertions(+), 78 deletions(-)