From patchwork Mon Apr 8 19:42:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13621544 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA4EFCD1292 for ; Mon, 8 Apr 2024 19:42:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 57F676B0087; Mon, 8 Apr 2024 15:42:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 52F5E6B0088; Mon, 8 Apr 2024 15:42:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41E486B0089; Mon, 8 Apr 2024 15:42:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 269CD6B0088 for ; Mon, 8 Apr 2024 15:42:41 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A4DB380139 for ; Mon, 8 Apr 2024 19:42:40 +0000 (UTC) X-FDA: 81987386880.26.05E55AD Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 6377E2001A for ; Mon, 8 Apr 2024 19:42:37 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=OQ21bnsu; dmarc=none; spf=none (imf13.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712605359; a=rsa-sha256; cv=none; b=acRDw5jZElwFtB4LqjjX11TB4H9WNfLV/IjaNVdSmPap3lmpZg35vrVclf+hFgDJ3EveIK VjIvs5UbVgHoAsoc0srRu0wYHnRorvstRNiytaoOx6DBJrzPbXeaWLYuJXde1vPg0gvOwV He11diKDTCEx2xmpfsX71ynQKR4221A= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=OQ21bnsu; dmarc=none; spf=none (imf13.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712605359; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=haoysfp0GSvdrFQlRHJYcSBmjTQbWyy8YmB+jXq7oTQ=; b=F4DQF7JLOmeNTMUivrAanSDztSQZMe4tUkHLCL21dUU83ltSu7NzSATaUCVoFUBQ3ZxRkX lJu8WQEG/nTLAxIBl1PjylGb9deP1Gj3kjYLMBxBEKYkG3xur89Pk9kvofM6+eWAxJKTrn DTXotJ5yJpBbgSc1XiIFi9uAL2jmNe0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=haoysfp0GSvdrFQlRHJYcSBmjTQbWyy8YmB+jXq7oTQ=; b=OQ21bnsu3Z/b7L+kCvhh2mGroN MILMBNMlU0muHiRb1sctJJiNBHncuZrRVDwnYgUBtDNRkSPOlw9kbKjYNSkHOJ4VXSswgM9SVM1WO K+HEyQfPTp2VGGD7fSwjXsxrDWP2piJBrG8q8HGmF4gtLxKq6WvB3Er1d29gXIfag0mNPa/1JXkV6 aJ95gFFqML3j7KRY2/FqeNTQ0lIO/fqpUHyWcTMMsoh2dK77KCtnUOzfqhsPLTjWwWgN1eBcv/fV4 gsJ7HNl9JB6aR5x1HqxQtv3s+WtjixKJFbaP+FmyF7ZU2kRLEqO61NwS6OfQC5tdQ2C6OdF99YQtz eLXXlIcA==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtut0-00000000Uq9-36n4; Mon, 08 Apr 2024 19:42:34 +0000 From: "Matthew Wilcox (Oracle)" To: Miaohe Lin Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Jane Chu , Dan Williams Subject: [PATCH v2 01/11] mm/memory-failure: Remove fsdax_pgoff argument from __add_to_kill Date: Mon, 8 Apr 2024 20:42:19 +0100 Message-ID: <20240408194232.118537-2-willy@infradead.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408194232.118537-1-willy@infradead.org> References: <20240408194232.118537-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6377E2001A X-Stat-Signature: bojn3ojz8ommdmx6iyfhyejhog6grdix X-HE-Tag: 1712605357-676624 X-HE-Meta: U2FsdGVkX19Tjd293yF58ml2fWK92nNE711UOmOofduFkL4SwNCn6xBCvXTfPQgZ9XSUK6Ba9r2gx7NwpLqjuE1iJnJz5UDHcNeJMqLhZGBh/YHEkCe3oEv0X7RL1jjGoCKPsdjC/SYM6M2z6GXEvyFWG2kZ9fSbUZx6m+vqZ9OV6KCfNg8TSih0m0/63pKRkwMmxGo2RZNIOX7BdhEfcoSrqFsV8gq5vE5jJ9ZdQJ7Hwq05ryE0An1QHnEoqdYn3Z77Knnj2FbnEkaUT9nFewpYBeefH260bQovuB21rBXn3KhBRf8gO/mUQxP64hfLnZkD28CxhSxAVOhV8HtNXa/uwaGfmhr+OgNyoh+/b2EXuHm0miw0prSRGl31H2jSg7THBTC7Xe3L8V308uWEZQwLnE7yV4VPQ8Lozk35CH2C9MRpp1bChH1uRmT/EqPQ4BMt2NSE7XehB6hqBZX2yg/PXkZ9S0SvKL3xATuKIbWpKr5XMuixMh+q3aqNiGg9LJvywO9lJNu0HYD8CYvW54ISQyGC/aDLRgju8PGCOaFqfBLG/2yI4Iha+hQ1JrDGI+w6uP9oCQThKsR2D3SWEKpl+6EzdeBihB8Hh5zqWDwolQhUtZnUS4Ol9gL3kzUlMaOz8oWHX7vgvzdX+6JeLYqjz+pDUBEPVaevaiGp8HhKLSUHIi4Gqwvk5mSH2l9kBguecaKD0NBMmtdp/MSWMevXD1agORlo9rKuBISX7VjcMcCY5ua81lh/gKgduX78u6QJlkadyuUEZ+gWqqYCrZX84c4WgAtePhwcuEnsumnZWgZWdEkDG2irMPIkupMq4DtlqqLTV0UPqlN6AYBgE11QDJZ4edssMV01QQvPwT8ZPAfnws46vDmK5tO49iMOeI6wSlrIkM+dtcMmRFW3ES0vW+1uOPPdSWKzzgrmciqd2zrfe215AzM/hMnqeGzBwdzNLHG73PqLJ/cpy4u vCS6pMU4 teh7t4b2blR+p50NQtV0LnGbuVWK5uJxByXFAymWQ+fPaAxYukB35I5SYhOip/WQ5MJbBSxMwkbeO7QZvGqTxBbJ6W602PWDcgd7T/18cyKSRz2y7TfspTIDG/g89m3HWq+PGCskFYb3E+wjU+JSuqI4CobCSzf8FICHszkrQZ7kBMs2uPC2jd/havPhA857Ck+iqlXNGPd1/fd8GnPZ5NHAIxoawgTI/Z8i9WDCwl8fKuZchqkhC2ZuTtrhpc5gRAEuML5QUhXo/Ed3ZVH55rMMy/6BktAKkbG2OKpy70UnnddI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Unify the KSM and DAX codepaths by calculating the addr in add_to_kill_fsdax() instead of telling __add_to_kill() to calculate it. Acked-by: Miaohe Lin Reviewed-by: Jane Chu Reviewed-by: Dan Williams Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Oscar Salvador --- mm/memory-failure.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index edd6e114462f..34b3c8255c9b 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -415,21 +415,13 @@ static unsigned long dev_pagemap_mapping_shift(struct vm_area_struct *vma, * not much we can do. We just print a message and ignore otherwise. */ -#define FSDAX_INVALID_PGOFF ULONG_MAX - /* * Schedule a process for later kill. * Uses GFP_ATOMIC allocations to avoid potential recursions in the VM. - * - * Note: @fsdax_pgoff is used only when @p is a fsdax page and a - * filesystem with a memory failure handler has claimed the - * memory_failure event. In all other cases, page->index and - * page->mapping are sufficient for mapping the page back to its - * corresponding user virtual address. */ static void __add_to_kill(struct task_struct *tsk, struct page *p, struct vm_area_struct *vma, struct list_head *to_kill, - unsigned long ksm_addr, pgoff_t fsdax_pgoff) + unsigned long addr) { struct to_kill *tk; @@ -439,12 +431,10 @@ static void __add_to_kill(struct task_struct *tsk, struct page *p, return; } - tk->addr = ksm_addr ? ksm_addr : page_address_in_vma(p, vma); - if (is_zone_device_page(p)) { - if (fsdax_pgoff != FSDAX_INVALID_PGOFF) - tk->addr = vma_address(vma, fsdax_pgoff, 1); + tk->addr = addr ? addr : page_address_in_vma(p, vma); + if (is_zone_device_page(p)) tk->size_shift = dev_pagemap_mapping_shift(vma, tk->addr); - } else + else tk->size_shift = page_shift(compound_head(p)); /* @@ -474,7 +464,7 @@ static void add_to_kill_anon_file(struct task_struct *tsk, struct page *p, struct vm_area_struct *vma, struct list_head *to_kill) { - __add_to_kill(tsk, p, vma, to_kill, 0, FSDAX_INVALID_PGOFF); + __add_to_kill(tsk, p, vma, to_kill, 0); } #ifdef CONFIG_KSM @@ -492,10 +482,10 @@ static bool task_in_to_kill_list(struct list_head *to_kill, } void add_to_kill_ksm(struct task_struct *tsk, struct page *p, struct vm_area_struct *vma, struct list_head *to_kill, - unsigned long ksm_addr) + unsigned long addr) { if (!task_in_to_kill_list(to_kill, tsk)) - __add_to_kill(tsk, p, vma, to_kill, ksm_addr, FSDAX_INVALID_PGOFF); + __add_to_kill(tsk, p, vma, to_kill, addr); } #endif /* @@ -669,7 +659,8 @@ static void add_to_kill_fsdax(struct task_struct *tsk, struct page *p, struct vm_area_struct *vma, struct list_head *to_kill, pgoff_t pgoff) { - __add_to_kill(tsk, p, vma, to_kill, 0, pgoff); + unsigned long addr = vma_address(vma, pgoff, 1); + __add_to_kill(tsk, p, vma, to_kill, addr); } /*