From mboxrd@z Thu Jan 1 00:00:00 1970 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 6A3F3E7719F for ; Mon, 13 Jan 2025 13:02:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A07F36B007B; Mon, 13 Jan 2025 08:02:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 990C86B0083; Mon, 13 Jan 2025 08:02:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E3676B0085; Mon, 13 Jan 2025 08:02:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 5B1D46B007B for ; Mon, 13 Jan 2025 08:02:25 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 06C481A0303 for ; Mon, 13 Jan 2025 13:02:25 +0000 (UTC) X-FDA: 83002442250.23.446C4A7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 486B9140016 for ; Mon, 13 Jan 2025 13:02:22 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="I5TLn/XI"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736773342; a=rsa-sha256; cv=none; b=IgcCOt7WAmgrpdhOdkmBcfnuKhUXyrF0y6yXo95roKySfTDm6usWb2UjcWp/iY0YzS7Gze 1JZ3lCcv+94ZZ1YXfVCwDfUVWwfwlZjA4d17YYqLNKU3NjESQSQUM5aPBlRtmu+WLlZDKR 4NlHYMlvHKIKpXDRlw0q0wm1FCODtRg= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="I5TLn/XI"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736773342; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4ZO5MboRIaY7V1KTamickkSMIzygDYlrzIr9iKL75p4=; b=8pV9pY0VZgrUneyAoFZzH0gr4PBzs9TtX6x9lgh59th9GMFPjqSA88w67qYsvMmOztMTfF NDqHx9W+Yeoid6zHoHDJABjH1+tJsWlkkGhvhIbRAddQjCkWxrbo6KjDM5/Orq2/vV9pVB 435ITwLCurIm6cZAcPJeng0z7GX/Aro= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736773341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=4ZO5MboRIaY7V1KTamickkSMIzygDYlrzIr9iKL75p4=; b=I5TLn/XIh0/Qtp0Xa28rfMiinZ4d0Da8kYOxr5UamYJjMcFo0lusvRKTy6XciqPoYoqaF+ 259m11AdhIqYoBhsfJSTAPLfUvIn7PFKAk6XSF/kNKORB/wbA6r5WqTaUzSz7QwgOaVZ2F t1Aq3EBmDVpIu9lyIaDgrPZj/PVPvMQ= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-300-b5dWkTRVPeiu5XHfWFvoyw-1; Mon, 13 Jan 2025 08:02:15 -0500 X-MC-Unique: b5dWkTRVPeiu5XHfWFvoyw-1 X-Mimecast-MFC-AGG-ID: b5dWkTRVPeiu5XHfWFvoyw Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4361f371908so29374275e9.0 for ; Mon, 13 Jan 2025 05:02:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736773334; x=1737378134; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=4ZO5MboRIaY7V1KTamickkSMIzygDYlrzIr9iKL75p4=; b=o67ztYAeHfkSAaP0Ope6tu9Ws/GQl0tyPrgXUylt/UoIZdypSjKJJH1VxBywjrwre3 VvWBPwTK3Nzxz+BwOZIe8JdkL8xY1nogHepQ/byOF37uYJ34FTD09VsgXseFW9AoJQg9 7RhlqPehBbVksgSJVpUm1rDx7zKBfi1AmeO4b4bLuLhLQDvVSW1lebQ0EclNv2N1ih5k PReUS7RdZGiIr13z0uPe4ghQShRt4GjtyAPnkV+dSszZHBnJ1zxI+MaAvTp7ylFlnPiJ bGdMk3iIQcfzRw0fwNAXDrKrzwCeemhaB3vB8a0LUkyDL1jIciaqAgaOWAI/aWz33pNr 2XXw== X-Gm-Message-State: AOJu0YwJynhXnLK2BPHMFMlZhyQx93gPa+gpqm0khVvDZyXkowkeusnm 2O804GP30j9pX7FX27u/L/G6et9SjxtsPl750bZCxSrZogTLFlI6tlwFyQChNQWCDl+UL2xnoui pxmMwIX5kihv5SJuU7XnHM76QAcDGoxuE1TEPTp9VZYw6kjlw X-Gm-Gg: ASbGncvMVxO12C+xuyodKdcLoDUXEQm+bnnO6VdnIXkJqnXXd0hqlWRfmxcVu77YYSO +76hldCTMxMy/4Bsysd6VXrxqsnBzVKjcK32O6/kJuluU1KqTHiXcIbtsNeJF8YPnIO7mVtS5Mf tTXU6AgJffinP2wNsgUNXdHweJTytg12fkAHHabViheQpArpqVwTROhPKgBrgJaGOMNTXmNewd+ IfLYNM2D9qCktSgIw6dXlb52/Np2jU/7H/Rtnb0IoIxsOVF77OLSIF1MfNeeNEtVaKYIrtjOrDg 5JRfklMlakwlF/o= X-Received: by 2002:a05:600c:1c8f:b0:434:f586:753c with SMTP id 5b1f17b1804b1-436e2686096mr192602265e9.7.1736773333985; Mon, 13 Jan 2025 05:02:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFYM/l4Dk/loH6IS5RnVtG2qCD18lP7N31C07+69vgbpNNuwvnXNF9DsXtAl3yXJ4fGUUweuw== X-Received: by 2002:a05:600c:1c8f:b0:434:f586:753c with SMTP id 5b1f17b1804b1-436e2686096mr192601575e9.7.1736773333394; Mon, 13 Jan 2025 05:02:13 -0800 (PST) Received: from ?IPV6:2a09:80c0:192:0:5dac:bf3d:c41:c3e7? ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e9e03e5fsm141588785e9.18.2025.01.13.05.02.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Jan 2025 05:02:12 -0800 (PST) Message-ID: <116daa16-42ff-4148-afb4-f904ada4460a@redhat.com> Date: Mon, 13 Jan 2025 14:02:10 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] mm: memory_hotplug: add TTU_HWPOISON for poisoned folio during migrate To: Wupeng Ma , akpm@linux-foundation.org, osalvador@suse.de, nao.horiguchi@gmail.com, linmiaohe@huawei.com, mhocko@suse.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20250113082718.1872494-1-mawupeng1@huawei.com> <20250113082718.1872494-2-mawupeng1@huawei.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250113082718.1872494-2-mawupeng1@huawei.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iFoWj8remcBXAuqjelj8_HiMMWIu7p7rI0ZW0TX2ZI0_1736773334 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: gmn4fzhocso1kn64gypbipng585aukin X-Rspam-User: X-Rspamd-Queue-Id: 486B9140016 X-Rspamd-Server: rspam08 X-HE-Tag: 1736773342-989662 X-HE-Meta: U2FsdGVkX19WXgaoIkVM4R65delQmPirP51Cx1wK5fX4nufRTc5l4Gs98Fr6fpkX06UHwqOP62AMu5wIibnTTrSzKKr/be7L/Y6jfRqSadK6rH2nF89iciilWi+UlK4D28SKicz7cITIWS7T4b4VYr7BvE0/3GT7RgeFRaqAcVkVFFR+pVZYuYvofiUBLuIJsZH60Kq47Hm1XfxD1jnuq6r+u6cRIlKf4iI0/7RE5hvcV314eLKAlhMluLeEo4jit4EIhqdmb23U8yXvolEwGTlCqUyW9G/xtSbZ7sjjuL8QB4RwVVEu+QBhwkDtInPF0zgeQz+hOY4MX9G00ES4SBFFGUtnSF6uSP34igi4bqkZWLWDawdxPugg8GPRDXOj/BNUFhAS7YLfT7WYo3HpkfWHAApZ33Iv97alfA3TJ1Dhlm8/gr5RrByf0TBwdSqBR6QEheWwe/LaDz2l2rbMhFzwS8RAUDYP7Xc/UrR8+bF0nUGr7kUqs0fykKQwsYxgxMhs6Me6zmMb79Kp1bqtAOEuNLj0//vKk0ZeErLxFpj54hTsQI9MC2sklzmyFT8zxp4PE8za4XeNaek0Q9F+4gb6B4S4PCDkv3eTkqikba51Tkr7QBAjr/5etAXFEoWU5RBUSU2H7d4suEZoP5WM+JmEMaJeqvBzynyUJOi7023NbirM+GBKNzFqKY+cCA06uCMBF413G7OUpHuTXM8v4A9SrGtieItDUmHYH5n3ioZiYsNgkckqBsEDG06Kl26ALtURXfffzUu+O7/7i9AxWCdRIwgixSuad1G6wwZhZq8ZRIqxb3HU1TZZxHO8dnXJfARHtHNVcDeoMnObyVXMGZcHmQKFwukNvkglvUch9BK4HYE3R0vAr8jBm2aLAfhbq7vW54xJFUNnFTMH3WnQ0QUeuNveyWlH4J0db5KzB5Od4fglA30EXxMhiG6WwGX82h2o+Wi38W/lgOY/PTf LcxhPx6l Hfv6orCrqcnfaW0j1ZFvELgrOGH4zLRsE5rkKKMuqqascGP1qNZPgcKGz5Sh0hdcF2xfa8MId57z+PU+EG5skVpT7Hcpys8BCuaaUY7zKKZ/6GpEYdqb84HrSrC1yM+NC1FouMahuBb1wGrujh/zzBfAXuu3DBxkVeXrijbGnPPj1r+vnNJ1+AXkN/XtgwIUZz7NmSCA59YxyG4Y1Sx7hiVO8pqUd6o0IEV3uhWAWSgb45iJd7Vr+P6AT/sHMiFb6rYex52BdcPjiUnSt0dq3To+tmwdYMYkvGkicarRMgKXYM2kiUADGh7cdzRu3G9LtNkt/x9pTU5xwZ4BE8xCFsITy80FStzGS1m6TcbP2Q30pjmlvgTi1Tjbq0drbjWL5fPm7UJ7se3Ih5CHkQqTDhUNO11BcMnwJue69qgf3/bC/DmjyS6uaRWbvu7HaZakUnqXa2TSbvLbi/r1WY0LsIP6q1cWXhFpr7AHsfZBNH1VYayAcz+ipwh07Sj5NG40fQTpyo3wFCCNbe7mBU0NSzdL3jiMZ4S1dkxruer91LI+ANXmEvI684XagWWWB9CUZDC4U+CBhpi9+veROVy2cd7UUXmsw2PwKqg9w 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: On 13.01.25 09:27, Wupeng Ma wrote: > From: Ma Wupeng > > Commit 6da6b1d4a7df ("mm/hwpoison: convert TTU_IGNORE_HWPOISON to > TTU_HWPOISON") introduce TTU_HWPOISON to replace TTU_IGNORE_HWPOISON > in order to stop send SIGBUS signal when accessing an error page after > a memory error on a clean folio. However during page migration, task > should be killed during migrate in order to make this operation succeed. > > Waring will be produced during unamp poison folio with the following log: > > ------------[ cut here ]------------ > WARNING: CPU: 1 PID: 365 at mm/rmap.c:1847 try_to_unmap_one+0x8fc/0xd3c Is that the if (unlikely(folio_test_swapbacked(folio) != folio_test_swapcache(folio))) { WARN_ON_ONCE(1); goto walk_abort; } ? > Modules linked in: > CPU: 1 UID: 0 PID: 365 Comm: bash Tainted: G W 6.13.0-rc1-00018-gacdb4bbda7ab #42 > Tainted: [W]=WARN > Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015 > pstate: 20400005 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) > pc : try_to_unmap_one+0x8fc/0xd3c > lr : try_to_unmap_one+0x3dc/0xd3c > Call trace: > try_to_unmap_one+0x8fc/0xd3c (P) > try_to_unmap_one+0x3dc/0xd3c (L) > rmap_walk_anon+0xdc/0x1f8 > rmap_walk+0x3c/0x58 > try_to_unmap+0x88/0x90 > unmap_poisoned_folio+0x30/0xa8 > do_migrate_range+0x4a0/0x568 > offline_pages+0x5a4/0x670 > memory_block_action+0x17c/0x374 > memory_subsys_offline+0x3c/0x78 > device_offline+0xa4/0xd0 > state_store+0x8c/0xf0 > dev_attr_store+0x18/0x2c > sysfs_kf_write+0x44/0x54 > kernfs_fop_write_iter+0x118/0x1a8 > vfs_write+0x3a8/0x4bc > ksys_write+0x6c/0xf8 > __arm64_sys_write+0x1c/0x28 > invoke_syscall+0x44/0x100 > el0_svc_common.constprop.0+0x40/0xe0 > do_el0_svc+0x1c/0x28 > el0_svc+0x30/0xd0 > el0t_64_sync_handler+0xc8/0xcc > el0t_64_sync+0x198/0x19c > ---[ end trace 0000000000000000 ]--- > > Add TTU_HWPOISON during unmap_poisoned_folio to fix this problem. > > Fixes: 6da6b1d4a7df ("mm/hwpoison: convert TTU_IGNORE_HWPOISON to TTU_HWPOISON") > Signed-off-by: Ma Wupeng > --- > mm/memory_hotplug.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index c43b4e7fb298..330668d37e44 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1806,7 +1806,7 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) > if (WARN_ON(folio_test_lru(folio))) > folio_isolate_lru(folio); > if (folio_mapped(folio)) > - unmap_poisoned_folio(folio, TTU_IGNORE_MLOCK); > + unmap_poisoned_folio(folio, TTU_IGNORE_MLOCK | TTU_HWPOISON); Correct me if I am wrong: if we reach that point, we already failed the unmap_poisoned_folio() in hwpoison_user_mappings(), and did a pr_err("%#lx: failed to unmap page (folio mapcount=%d)\n", ... there. This all looks odd. We must not call unmap_*() on an anon folio without setting TTU_HWPOISON ever if they are poisoned. But for the pagecache we just might want to? What about detecting the flags internally and just moving the detection logic into unmap_poisoned_folio()? diff --git a/mm/internal.h b/mm/internal.h index 109ef30fee11f..eb8266d754b71 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1115,7 +1115,7 @@ static inline int find_next_best_node(int node, nodemask_t *used_node_mask) * mm/memory-failure.c */ #ifdef CONFIG_MEMORY_FAILURE -void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu); +int unmap_poisoned_folio(struct folio *folio, bool must_kill); void shake_folio(struct folio *folio); extern int hwpoison_filter(struct page *p); @@ -1138,7 +1138,7 @@ unsigned long page_mapped_in_vma(const struct page *page, struct vm_area_struct *vma); #else -static inline void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) +static inline int unmap_poisoned_folio(struct folio *folio, bool must_kill) { } #endif diff --git a/mm/memory-failure.c b/mm/memory-failure.c index a7b8ccd29b6f5..2054b63e9b79c 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1556,8 +1556,29 @@ static int get_hwpoison_page(struct page *p, unsigned long flags) return ret; } -void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) +int unmap_poisoned_folio(struct folio *folio, bool must_kill) { + enum ttu_flags ttu = TTU_IGNORE_MLOCK | TTU_SYNC | TTU_HWPOISON; + struct address_space *mapping; + + /* + * Propagate the dirty bit from PTEs to struct page first, because we + * need this to decide if we should kill or just drop the page. + * XXX: the dirty test could be racy: set_page_dirty() may not always + * be called inside page lock (it's recommended but not enforced). + */ + mapping = folio_mapping(folio); + if (!must_kill && !folio_test_dirty(folio) && mapping && + mapping_can_writeback(mapping)) { + if (folio_mkclean(folio)) { + folio_set_dirty(folio); + } else { + ttu &= ~TTU_HWPOISON; + pr_info("%#lx: corrupted page was clean: dropped without side effects\n", + pfn); + } + } + if (folio_test_hugetlb(folio) && !folio_test_anon(folio)) { struct address_space *mapping; @@ -1580,6 +1601,8 @@ void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) } else { try_to_unmap(folio, ttu); } + + return folio_mapped(folio) ? -EBUSY : 0; } /* @@ -1589,8 +1612,6 @@ void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) static bool hwpoison_user_mappings(struct folio *folio, struct page *p, unsigned long pfn, int flags) { - enum ttu_flags ttu = TTU_IGNORE_MLOCK | TTU_SYNC | TTU_HWPOISON; - struct address_space *mapping; LIST_HEAD(tokill); bool unmap_success; int forcekill; @@ -1618,24 +1639,6 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p, ttu &= ~TTU_HWPOISON; } - /* - * Propagate the dirty bit from PTEs to struct page first, because we - * need this to decide if we should kill or just drop the page. - * XXX: the dirty test could be racy: set_page_dirty() may not always - * be called inside page lock (it's recommended but not enforced). - */ - mapping = folio_mapping(folio); - if (!(flags & MF_MUST_KILL) && !folio_test_dirty(folio) && mapping && - mapping_can_writeback(mapping)) { - if (folio_mkclean(folio)) { - folio_set_dirty(folio); - } else { - ttu &= ~TTU_HWPOISON; - pr_info("%#lx: corrupted page was clean: dropped without side effects\n", - pfn); - } - } - /* * First collect all the processes that have the page * mapped in dirty form. This has to be done before try_to_unmap, @@ -1643,9 +1646,7 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p, */ collect_procs(folio, p, &tokill, flags & MF_ACTION_REQUIRED); - unmap_poisoned_folio(folio, ttu); - - unmap_success = !folio_mapped(folio); + unmap_success = !unmap_poisoned_folio(folio, flags & MF_MUST_KILL); if (!unmap_success) pr_err("%#lx: failed to unmap page (folio mapcount=%d)\n", pfn, folio_mapcount(folio)); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index e3655f07dd6e3..c549e68102251 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1833,7 +1833,7 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) if (WARN_ON(folio_test_lru(folio))) folio_isolate_lru(folio); if (folio_mapped(folio)) - unmap_poisoned_folio(folio, TTU_IGNORE_MLOCK); + unmap_poisoned_folio(folio, false); continue; } -- 2.47.1 -- Cheers, David / dhildenb