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 AF99FCD128A for ; Sat, 6 Apr 2024 04:14:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 308026B0083; Sat, 6 Apr 2024 00:14:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2913C6B0087; Sat, 6 Apr 2024 00:14:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10BBF6B0088; Sat, 6 Apr 2024 00:14:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E69046B0083 for ; Sat, 6 Apr 2024 00:14:09 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7A3C2C10E0 for ; Sat, 6 Apr 2024 04:14:09 +0000 (UTC) X-FDA: 81977789418.19.6B3006E Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf05.hostedemail.com (Postfix) with ESMTP id 3DF52100012 for ; Sat, 6 Apr 2024 04:14:06 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Jzq400Hd; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=5uM0TCDJ; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Owkz9dMb; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=GpPWaHH6; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf05.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712376847; a=rsa-sha256; cv=none; b=gh7iVoo3iIzYzL/JjqvGgvBixknRyl965qYo/oRJJPQGXtGnn11H1gY/j0phFwV+mdPFsg 0ErUTc9Za0J8OgS6AZ+Hn3d3QfRoQSr2aBGk9bmgS1Hx+WJY0OqaM525shl5AqPnLWPplG kJrJxHS5DpBuDuP26TmIqMscwZU/vNM= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Jzq400Hd; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=5uM0TCDJ; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Owkz9dMb; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=GpPWaHH6; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf05.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712376847; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cjtIACdf56lsb48fPgau7QTbXRv0Znpoydy6nd1VoMo=; b=Hkk6/okH/4YjsDhR9eJacPVRkJbXKOC737dinjVqxbWULUodOZLq9w4Nt1DMSmBkEkUq3P RdIaXHIRtUlPbh9WPlbM9Fnwp2Ccsf9fgwsJ3F+i6RZKLl+WqUiZlz8xoVmsDX7MQRvZki rePiBP6B/H1dOh7DqtkJvIOghLQTmQU= Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5AF0F21A21; Sat, 6 Apr 2024 04:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712376845; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cjtIACdf56lsb48fPgau7QTbXRv0Znpoydy6nd1VoMo=; b=Jzq400HdO1lh6eLtb3HFEmm2ldMFdul5W3C+ve64sAgbU9KKYB0avkWEm9VcE7nyrRwCCu Na62CKz4d34TP6CC7JL7kSzpjSp6CcR0iyi9ncMrj9ISJs3GKaKcV4MD3v3y9ATJLO9A5O blFYrOcHFFg8roV/Cr/yYcpjMrhqwN8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712376845; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cjtIACdf56lsb48fPgau7QTbXRv0Znpoydy6nd1VoMo=; b=5uM0TCDJ3/pMCt6fnWLMvo7M4k7W6LXlA9krE9FCzB2Xay6yxrtnRXt8INXD1HQG+OfBtX /lqe86F8WBL5a6CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712376844; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cjtIACdf56lsb48fPgau7QTbXRv0Znpoydy6nd1VoMo=; b=Owkz9dMb4lgQB0r6905QUzm1E6Ob1JFFYjSq1Mk6jFuKpGUIMi/qnVXSeKPZEp0SN7WHp/ 0ZKHp1PtqNa2izbzDQTa4k2gE0FbHQw31gqojdbzBteJuEFNlxZE0DYJpHyURhJ2SUJfJq PduY8DYapBi8HD5pDs0xrXCdO1G8vbQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712376844; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cjtIACdf56lsb48fPgau7QTbXRv0Znpoydy6nd1VoMo=; b=GpPWaHH6BlWM/r90C+svB74j6kyEMIdhu1zxya72DoVX6QQHgX0Yt/N6gwAA42WVqmMZvV Bzu4RcXyLdw/C3AA== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id D93DB138E7; Sat, 6 Apr 2024 04:14:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap2.dmz-prg2.suse.org with ESMTPSA id l6AKMgvMEGbTKQAAn2gu4w (envelope-from ); Sat, 06 Apr 2024 04:14:03 +0000 Date: Sat, 6 Apr 2024 06:13:57 +0200 From: Oscar Salvador To: Tony Luck Cc: David Hildenbrand , Borislav Petkov , Yazen Ghannam , Miaohe Lin , Naoya Horiguchi , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Subject: Re: Machine check recovery broken in v6.9-rc1 Message-ID: References: <1e943439-6044-4aa4-8c41-747e9e4dca27@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Action: no action X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 3DF52100012 X-Stat-Signature: xs3angq1abfbo8gqcbrgndh6847t3a7d X-HE-Tag: 1712376846-240034 X-HE-Meta: U2FsdGVkX18LJrQ8qPACKw+/yw6Hqq3zxjvAgD2AHjmKQoAEZ9PYqz3aHAY2X2//QmsJ4bG7hdEl0aXDZk0zXm2YQGVGAX7kgF/datARRZ2T3/MEdRa3udrp2BiU3xUsJHbnYCGLLuGe3x8l5XaKfMB8JqDl9lgb3czd4JC1clsd1um/naC/OjMfXNa5Ba5ooZiLMAdsXAOpPZcjWkZqS0gXUD5vsXhBxOwgjc2TM/IXQzXw6aL6+3frwjWLXVL2ptmM+Ijg0GwsPpwjsjSQfrUp5mtPOFl75ka70EX+HDWNQJdTlSfrt+o2sIvL1Wq2p86nrBnOTOKuPlaekz59IXTOPNbjm28BX3tQ5qBOUWGAnJTnhKkr8xa2O0mfWCez1WbLYhMq5Bce9RFWZHrNC3XTctTvHvY/uqoVxT9CCR1TFNQM878Mg0m5eVa1kyoXl4qFdZ8TQHhO9zqgsB+FpuGg5dyRGuD0Vt3JUpleNdSr62348NEItJ0D+dPXcEp3Cj8MacKGqi2o5Rj1sQ3WI9WKxIHEkxB+J1Vy9gy6eA/hZVJA//r9/MLePwp2wEb8R2BWGLlkyGJJ/3oWuRJ4NfW2nDhmD9gEM7j3vrtm8h0Ocfg3prTalrdt8lyCtS1vA8uH//jhJUte20OLWxeCUCnIDQaOIY1U7aKWNr7CMs7i1jeIShIA2L/AGuUmg/Zmk26CHro5nE3oaB7h//P3KHPU3o67iXKhf1xsUnpjRYI+DKug1lN6wHXQxuetiFEf6H5+On8teT6W6gvUhZriN6AXLmwzykJwKf60/ivuKJl+WhrOKFoPDS20TjSW3rSrAYlQ6Yn2bfCi9pK1G4Oo/tVgqgxsu+i6GEDjMkGWBpR9RDRn2hFOD9tF9gjGECyl8AkNnqOvBHfiNfw3mbpO9EFvlB5sSxAb7NI1wnuTZ8k1j0axGp39MVLGoQaRagm2190GqDFUwbD09UBpM+E IRvR6QyH Xzn0ZVu5vghUpkjBZDk6B2099ufzJVcKpcnAa0MXunDBkk+VKrN71Frv/n0sl1nvwh5jZA+W/VLVUbGvP06Kpo0bFGjhvbbYwOw1QdUZ8RdFW7PnofTYZSih1UxB78gYmED0rluVuU5mBYpsnnTD+MWy1JKodyUhtnbvdP2kZWlfx+w/eALoGXGb9JCCBX+KbnsdmzxS40aNpRzf0/KvMjbVgkxG1zW5sBRtDewLOYkIAYukDEyfs1+teVg== 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 Sat, Apr 06, 2024 at 05:54:47AM +0200, Oscar Salvador wrote: > Sorry, I was still sleepy and I made a typo. > Plus I realized we need to move some definitions to make them available. > > This should have been (compile tested only): This one is against 6.1 (previous one was against v6.9-rc2): Again, compile tested only diff --git a/include/linux/swapops.h b/include/linux/swapops.h index 578212fbf2be..5d720f15e811 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -313,6 +313,55 @@ static inline int is_readable_migration_entry(swp_entry_t entry) #endif /* CONFIG_MIGRATION */ +#ifdef CONFIG_MEMORY_FAILURE + +extern atomic_long_t num_poisoned_pages __read_mostly; + +/* + * Support for hardware poisoned pages + */ +static inline swp_entry_t make_hwpoison_entry(struct page *page) +{ + BUG_ON(!PageLocked(page)); + return swp_entry(SWP_HWPOISON, page_to_pfn(page)); +} + +static inline int is_hwpoison_entry(swp_entry_t entry) +{ + return swp_type(entry) == SWP_HWPOISON; +} + +static inline void num_poisoned_pages_inc(void) +{ + atomic_long_inc(&num_poisoned_pages); +} + +static inline void num_poisoned_pages_sub(long i) +{ + atomic_long_sub(i, &num_poisoned_pages); +} + +#else /* CONFIG_MEMORY_FAILURE */ + +static inline swp_entry_t make_hwpoison_entry(struct page *page) +{ + return swp_entry(0, 0); +} + +static inline int is_hwpoison_entry(swp_entry_t swp) +{ + return 0; +} + +static inline void num_poisoned_pages_inc(void) +{ +} + +static inline void num_poisoned_pages_sub(long i) +{ +} +#endif /* CONFIG_MEMORY_FAILURE */ + typedef unsigned long pte_marker; #define PTE_MARKER_UFFD_WP BIT(0) @@ -416,7 +465,7 @@ static inline bool is_pfn_swap_entry(swp_entry_t entry) BUILD_BUG_ON(SWP_TYPE_SHIFT < SWP_PFN_BITS); return is_migration_entry(entry) || is_device_private_entry(entry) || - is_device_exclusive_entry(entry); + is_device_exclusive_entry(entry) || is_hwpoison_entry(entry); } struct page_vma_mapped_walk; @@ -485,55 +534,6 @@ static inline int is_pmd_migration_entry(pmd_t pmd) } #endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ -#ifdef CONFIG_MEMORY_FAILURE - -extern atomic_long_t num_poisoned_pages __read_mostly; - -/* - * Support for hardware poisoned pages - */ -static inline swp_entry_t make_hwpoison_entry(struct page *page) -{ - BUG_ON(!PageLocked(page)); - return swp_entry(SWP_HWPOISON, page_to_pfn(page)); -} - -static inline int is_hwpoison_entry(swp_entry_t entry) -{ - return swp_type(entry) == SWP_HWPOISON; -} - -static inline void num_poisoned_pages_inc(void) -{ - atomic_long_inc(&num_poisoned_pages); -} - -static inline void num_poisoned_pages_sub(long i) -{ - atomic_long_sub(i, &num_poisoned_pages); -} - -#else /* CONFIG_MEMORY_FAILURE */ - -static inline swp_entry_t make_hwpoison_entry(struct page *page) -{ - return swp_entry(0, 0); -} - -static inline int is_hwpoison_entry(swp_entry_t swp) -{ - return 0; -} - -static inline void num_poisoned_pages_inc(void) -{ -} - -static inline void num_poisoned_pages_sub(long i) -{ -} -#endif /* CONFIG_MEMORY_FAILURE */ - static inline int non_swap_entry(swp_entry_t entry) { return swp_type(entry) >= MAX_SWAPFILES; -- Oscar Salvador SUSE Labs