From patchwork Tue May 23 00:43:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 97663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1819052vqo; Mon, 22 May 2023 18:08:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5E/+RV1Hq9hYdQj+uOCw+adSDPWisaLJAlWRoewqGIA+8DJGznwgFgicgKB8PAShY170s/ X-Received: by 2002:a17:903:41c5:b0:1ad:f7d9:1ae2 with SMTP id u5-20020a17090341c500b001adf7d91ae2mr17136748ple.55.1684804128191; Mon, 22 May 2023 18:08:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684804128; cv=none; d=google.com; s=arc-20160816; b=Cgd8+Oectb4XLEsolt88c3HbU4ozxI8HewKLgcSmAknT2S5Jvzlzk5FWh1sPzRRaSN nGMbPKfB8eidHX0pQ4N6n20M0YHbfw38zRZuRvetBjwnysHVy9g7rmbPEfIuwCP+G/4m +IqwI2aKXuickPpH822IJheSUvcEV14g8ZT2lXXNTNus7Ji8LfqRVqnSR0iIPGs82Xok tyIm0iqFLT+MfehskU88udyrFE6D5TU4X1W4/gY+p0F/NX5NlJHiD6mVvL7qEN9FXo4K bhgQK2yc3JRaC+Y/wSgvm7HJG94pgs5W1ehiSyaYKWhDOxvA1h4R5ZueRggD404UtJPF m9VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:from:subject :references:mime-version:message-id:in-reply-to:date:dkim-signature; bh=msTm3oYdeXIT0hSlyDwQQkvc5wY+Q8yhko13bmJatr8=; b=Mmr9pQSmdPV/SwnrUSe/rrAa5iOU/lJcymsz0BN9B/GN4yzuDJRxP8G2y7kSu/liJk XX/O9MetUiE8E20p+lZKep6Z+mzI0zX3CYYmuR/NFGBlHheuHSSL6vwfyb/2tXoPL4bv wN3IFpXjNRKD1kJMPSOjJjXrQbAm2UBAlMCIrFMXOTp/cHBbAxmlN7mzOeodQkGAEHYY jEipHcuHTovGnrxlcg+svS3JSYNabPs0R9M2XQjIK5FXOSz2ghcj106ultiUPfJMfFvB 5tiinVi9kFNfHmRsJLmkw5d5YYBaipDrTEmN7ZJ5M3XJfZJesLcradboS21LqogMfiaE Fvow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=GVCKc+6r; 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=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l5-20020a170902f68500b001afada38c64si864774plg.302.2023.05.22.18.08.36; Mon, 22 May 2023 18:08:48 -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=@google.com header.s=20221208 header.b=GVCKc+6r; 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=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235214AbjEWAv5 (ORCPT + 99 others); Mon, 22 May 2023 20:51:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232331AbjEWAvm (ORCPT ); Mon, 22 May 2023 20:51:42 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71B6E4C3F for ; Mon, 22 May 2023 17:44:59 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-babb7aaa605so5322208276.3 for ; Mon, 22 May 2023 17:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684802597; x=1687394597; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc:subject:date :message-id:reply-to; bh=msTm3oYdeXIT0hSlyDwQQkvc5wY+Q8yhko13bmJatr8=; b=GVCKc+6rFVLitBZRgjiG8Xp6MHuRDVhZtsHNX/VKvhjNUXI2g+oF9FkWUEYw2KzSxD jp4IhTdFiglLXHuJvOecRUNblTjQqoij5ls5a85sMq/WccA2cWXYiEuTGZE2QPc25z1P I8fzTiWeaDqvG0LuwqBGkTuunNP3dF5yHaQZQWU03AGRfLddIWVSlV0GDW2IfHKUwGIa kJWuZ1I6IkldXrYkOwPS0n6CmraBvOXwhnVIajQXxhcVGPXShTLQ3KiXtaS4Kg9Pbdet qc17JRlFojhHHmnUA1aiDUv9PQDzUO/0c5Sa9DD8d5/h5mOmX7eaqslAsS0IaFcRV2+j ohtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684802597; x=1687394597; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=msTm3oYdeXIT0hSlyDwQQkvc5wY+Q8yhko13bmJatr8=; b=QIb8BqVmpvSIr7HnVXogYInd6JS3on4Oeoi0x3fMuBOJNG6pWo3xmj0xcuTy4TBlKT pLoohja6XEYuVcHzL5CGysbgqm6iy0vKZ7jeUFfUC3/u+M0szgwhVTJM47rP4MckNlbh MI+IYM1SsgsXlMt4HuDA3La0dh33hr0iBr3ofdwKpkm8u/+O9Kb2fKO1Gw4daBhP2i2F VPKpgbDFkVpWR9oByWM0FQi3oTWtYtBDjeyehSYqG32OqxZmcYKhlBmaNylngrMaPkHp nlqx4OhbeFqOWnk26YNBCWNka73mOxPqErCo1gKP7gxrfyXRfFw3HwWtRwryxA5L8Q2T aQvg== X-Gm-Message-State: AC+VfDyYU1+IIGipQf+kyhS2/1ayvuNknJrxZw6afo6kNs4lzWlyPRwE 6E+xfJQmj61VVMcFvCmbPvesywY= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2d3:205:3d33:90fe:6f02:afdd]) (user=pcc job=sendgmr) by 2002:a25:10d4:0:b0:ba8:181b:2558 with SMTP id 203-20020a2510d4000000b00ba8181b2558mr7332911ybq.4.1684802597761; Mon, 22 May 2023 17:43:17 -0700 (PDT) Date: Mon, 22 May 2023 17:43:08 -0700 In-Reply-To: <20230523004312.1807357-1-pcc@google.com> Message-Id: <20230523004312.1807357-2-pcc@google.com> Mime-Version: 1.0 References: <20230523004312.1807357-1-pcc@google.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Subject: [PATCH v4 1/3] mm: Call arch_swap_restore() from do_swap_page() From: Peter Collingbourne To: Catalin Marinas Cc: Peter Collingbourne , " =?utf-8?b?UXVuLXdlaSBMaW4gKA==?= =?utf-8?b?5p6X576k5bS0KQ==?= " , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "surenb@google.com" , "david@redhat.com" , " =?utf-8?b?Q2hpbndlbiBDaGFuZyAo5by1?= =?utf-8?b?6Yym5paHKQ==?= " , "kasan-dev@googlegroups.com" , " =?utf-8?b?S3Vh?= =?utf-8?b?bi1ZaW5nIExlZSAo5p2O5Yag56mOKQ==?= " , " =?utf-8?b?Q2FzcGVyIExpICjmnY7kuK3mpq4p?= " , "gregkh@linuxfoundation.org" , vincenzo.frascino@arm.com, Alexandru Elisei , will@kernel.org, eugenis@google.com, Steven Price , stable@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, 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, USER_IN_DEF_DKIM_WL 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?1766645173076292830?= X-GMAIL-MSGID: =?utf-8?q?1766645173076292830?= Commit c145e0b47c77 ("mm: streamline COW logic in do_swap_page()") moved the call to swap_free() before the call to set_pte_at(), which meant that the MTE tags could end up being freed before set_pte_at() had a chance to restore them. Fix it by adding a call to the arch_swap_restore() hook before the call to swap_free(). Signed-off-by: Peter Collingbourne Link: https://linux-review.googlesource.com/id/I6470efa669e8bd2f841049b8c61020c510678965 Cc: # 6.1 Fixes: c145e0b47c77 ("mm: streamline COW logic in do_swap_page()") Reported-by: Qun-wei Lin (林群崴) Closes: https://lore.kernel.org/all/5050805753ac469e8d727c797c2218a9d780d434.camel@mediatek.com/ Acked-by: David Hildenbrand Acked-by: "Huang, Ying" Reviewed-by: Steven Price Acked-by: Catalin Marinas --- v2: - Call arch_swap_restore() directly instead of via arch_do_swap_page() mm/memory.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index f69fbc251198..fc25764016b3 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3932,6 +3932,13 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) } } + /* + * Some architectures may have to restore extra metadata to the page + * when reading from swap. This metadata may be indexed by swap entry + * so this must be called before swap_free(). + */ + arch_swap_restore(entry, folio); + /* * Remove the swap entry and conditionally try to free up the swapcache. * We're already holding a reference on the page but haven't mapped it From patchwork Tue May 23 00:43:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 97661 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1817797vqo; Mon, 22 May 2023 18:05:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6j8V5w9GlWPppqzV27WMNDQiYar4qvhKPvpHQ0rzbB6kg7xawhStnK2N6JDFAvh6tSMAwT X-Received: by 2002:a17:903:11d2:b0:1ab:160c:526d with SMTP id q18-20020a17090311d200b001ab160c526dmr14006699plh.22.1684803937876; Mon, 22 May 2023 18:05:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684803937; cv=none; d=google.com; s=arc-20160816; b=QCGkwYhdkIxDRu3OpLPOiK8HzYSs2YPd3ZLCJphioynhJLOBV/8Ap5Q0jkAZe8eNPK /K4usKL6Zx7E469j5pNQqgL8Igd7IlOYh/B+/bPGiG8c9QYmvTBz127UncSD9gJ7FPfM DGdlamzoJLvodw/kWCzEMxJEddubBXRhy5k18UbtEjrWHTlrsaZvwTvWJBPQrRxoUmSR Unb14alGzAiWaEUbWtBHEItCU7lj6cV6qnrHGdGQ8UIeMWZLQMmRHtbMWr/fUYDkT2Xt PrirYQHtdxgsYzVXDdtDM/p5ClpgspFHlKDKMbm7WiSCn5HBjIbQoh/SeTNo7IjW6/rA bBhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=bX87CylYnN+5c55ItUvtBMTDdL52LhDBMQG45ADuUIs=; b=XGfuvpoUP2uyNQd977XiVV/m5iX+EHyAEu2nUPOt/dXqlfwI0DGpmT+a6G8zJVVBwD Z1b/qGcWfFBeXxkeq/hHUUBvZDnTAcyIj8aP3s1aEfXmA9vp1Qfk62geWpOGGtHxc3sI DMvNDBIudgzcpMEH/6GUkB0RTf3h933TF9j8EWLteQpktucspNa9bNdyOYXqbiO8prjW LSxtWyq9Jh+Bq8d1Yz6DdVXLUrjdRlQm0/FANgN7kdwz9q/uzCuWbATpw/LQ0g9OsqOS xR2vMgbCiEEZrbWv5uhj+QCAVaSbfcd7tmA8qvzOW50qN4u5eCDBKWwYRO7UTz/D9dIP wuPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="bdogDu/L"; 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=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u11-20020a170903124b00b001ab23d42f37si3090255plh.258.2023.05.22.18.05.25; Mon, 22 May 2023 18:05:37 -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=@google.com header.s=20221208 header.b="bdogDu/L"; 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=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234374AbjEWAxO (ORCPT + 99 others); Mon, 22 May 2023 20:53:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235235AbjEWAww (ORCPT ); Mon, 22 May 2023 20:52:52 -0400 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BB5C59D7 for ; Mon, 22 May 2023 17:46:15 -0700 (PDT) Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-ba81b37d9d2so12214219276.3 for ; Mon, 22 May 2023 17:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684802600; x=1687394600; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=bX87CylYnN+5c55ItUvtBMTDdL52LhDBMQG45ADuUIs=; b=bdogDu/LWKIXK0xhj/mHEXmPSLZDQ4wTkCFpl5MS9xXgMH/lrIKDBgMm2OVW0088Ob UUXOUas2bD7bxDVYmP+pP6qAeeNNcNNzpyrJngzal1hujSvkuKEu7+oTZMvffng5FsBp gwlthK4wI9AiO+Fdzy5ned4Ve4n2qyJlWIgHIhgxohsY1Qw8A0XJY+vCXRNI9cCOvTZk GipdqA6ZJmCkCppBtgmsiSQUIm6BRaEmUEy2YBmPt0Mrmuq/dUUS0r0t46hxsqR6HbX9 qaAwcxK6iWLJ/y3GzsvNuhSXXmpx/eIa9uHJFpCvIlk4HbNQJ1mX497oATiIBKnqBGwO uixA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684802600; x=1687394600; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bX87CylYnN+5c55ItUvtBMTDdL52LhDBMQG45ADuUIs=; b=TXqkts8VeLwBMo/5BeeLWFDXGYRoNDr21UY5u0a7ISSOemLRBHJVZMmdJbSBqQcEgb R6wyDq9PveU4rOIqCqzyXVtyyyBWuqLkts1Oeb+MJry2vPTfjGu4l5GumogqJC9XbLvO NYZX8gp/u5uQzXNBsGQK4AzH2ffptR+oN6hTJWh77MLOJ2lHmuN9gxsRPkEmLYlGjL8N SS4sLK1WqwIZQ3AGOCNmMukzeW5dtENQ6OMoEK6Fo8AWCsGrvKY1vvT6VOBi9ttUFGHK SQyKUAbks95PncRrVT73jwGmVDt7oX9HobgpPcby9LmML/GoTyisLCtJpWE5CittjBQ8 PyZA== X-Gm-Message-State: AC+VfDxNQAqqmMtAgn8zjdMiSfxIsOImzIfZMUB0Z3bbTRhwgACDj+Vv btCbKtHup5b6pvjnLcEY3EO2GIA= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2d3:205:3d33:90fe:6f02:afdd]) (user=pcc job=sendgmr) by 2002:a25:d55:0:b0:ba8:9455:85b9 with SMTP id 82-20020a250d55000000b00ba8945585b9mr5274091ybn.4.1684802600447; Mon, 22 May 2023 17:43:20 -0700 (PDT) Date: Mon, 22 May 2023 17:43:09 -0700 In-Reply-To: <20230523004312.1807357-1-pcc@google.com> Message-Id: <20230523004312.1807357-3-pcc@google.com> Mime-Version: 1.0 References: <20230523004312.1807357-1-pcc@google.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Subject: [PATCH v4 2/3] mm: Call arch_swap_restore() from unuse_pte() From: Peter Collingbourne To: Catalin Marinas Cc: Peter Collingbourne , " =?utf-8?b?UXVuLXdlaSBMaW4gKA==?= =?utf-8?b?5p6X576k5bS0KQ==?= " , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "surenb@google.com" , "david@redhat.com" , " =?utf-8?b?Q2hpbndlbiBDaGFuZyAo5by1?= =?utf-8?b?6Yym5paHKQ==?= " , "kasan-dev@googlegroups.com" , " =?utf-8?b?S3Vh?= =?utf-8?b?bi1ZaW5nIExlZSAo5p2O5Yag56mOKQ==?= " , " =?utf-8?b?Q2FzcGVyIExpICjmnY7kuK3mpq4p?= " , "gregkh@linuxfoundation.org" , vincenzo.frascino@arm.com, Alexandru Elisei , will@kernel.org, eugenis@google.com, Steven Price X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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?1766644974189843200?= X-GMAIL-MSGID: =?utf-8?q?1766644974189843200?= We would like to move away from requiring architectures to restore metadata from swap in the set_pte_at() implementation, as this is not only error-prone but adds complexity to the arch-specific code. This requires us to call arch_swap_restore() before calling swap_free() whenever pages are restored from swap. We are currently doing so everywhere except in unuse_pte(); do so there as well. Signed-off-by: Peter Collingbourne Link: https://linux-review.googlesource.com/id/I68276653e612d64cde271ce1b5a99ae05d6bbc4f Suggested-by: David Hildenbrand Acked-by: David Hildenbrand Acked-by: "Huang, Ying" Reviewed-by: Steven Price Acked-by: Catalin Marinas --- mm/swapfile.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mm/swapfile.c b/mm/swapfile.c index 274bbf797480..e9843fadecd6 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1794,6 +1794,13 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, goto setpte; } + /* + * Some architectures may have to restore extra metadata to the page + * when reading from swap. This metadata may be indexed by swap entry + * so this must be called before swap_free(). + */ + arch_swap_restore(entry, page_folio(page)); + /* See do_swap_page() */ BUG_ON(!PageAnon(page) && PageMappedToDisk(page)); BUG_ON(PageAnon(page) && PageAnonExclusive(page));