From patchwork Fri Feb 16 09:51:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kairui Song X-Patchwork-Id: 13559724 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 DDBAFC48260 for ; Fri, 16 Feb 2024 09:51:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 350006B00AF; Fri, 16 Feb 2024 04:51:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 300566B00B0; Fri, 16 Feb 2024 04:51:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A0916B00B1; Fri, 16 Feb 2024 04:51:18 -0500 (EST) 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 0AD446B00AF for ; Fri, 16 Feb 2024 04:51:18 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AF1A3A0415 for ; Fri, 16 Feb 2024 09:51:17 +0000 (UTC) X-FDA: 81797198994.12.B148C71 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf25.hostedemail.com (Postfix) with ESMTP id 197D6A0008 for ; Fri, 16 Feb 2024 09:51:15 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dL8AhBE9; spf=pass (imf25.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708077076; h=from:from:sender:reply-to: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:references:dkim-signature; bh=Y2vHnI5LSLRE33MfHS1ReUQs4VrL3VJWSAdI/Ri9+mw=; b=hiczi7PEijkRcDxEvKUjNR6KH4CByUzsQ3YJ7O3ah9aTBsRPVRMYyS9iGlJfzOf6eZrA/l lKggOuIiQjx1lLJ2C507/cfKM2pT4qb1V5Biy/d1qpBW4EYVQ9qtFKkDn0CZXhLwpB2qJE NXKMVEWZhBrHZ+OFZTF1HuQszRilsOg= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dL8AhBE9; spf=pass (imf25.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708077076; a=rsa-sha256; cv=none; b=yYwkQn5bsux9XJN+2cJPIJGF1URlBaQvL3liLEZ+kVbnrAJB8G5rs6sfCYcZaxqZo2fw22 TNfFx+bGYMWmsY116I4W7fk8oPHtkCIzfEoX3Sc1yePLDbabuq3bT+8GTyJZ/c8bwXefJF yP8kYjQ9R400T1ggW01KOz9fGG9WLuQ= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6e0fc87fc2dso1153250b3a.3 for ; Fri, 16 Feb 2024 01:51:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708077073; x=1708681873; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y2vHnI5LSLRE33MfHS1ReUQs4VrL3VJWSAdI/Ri9+mw=; b=dL8AhBE9N6axMq21mi02A3DvomdDlLbWNtVT5f1UYpTzNplnER668YJ6hh5YkmzVau 49luJj9tmSuHbewKrsX4wkNKqf7l2qfQGRrKT+Ch84cVj65v6Xs7I8KJUqoiF2I5JEFa 1AF7GtzUvnQgcIg6G3E9ZVsBC+gdsuSuwrvmldMw8q62lPD2J1oy/ztg6ZNM3gcUsEAS e42USjAnrEgKXPj2Kl6VjMRLaRex1W/2a8rXb9hvJ6e4s+MEyJRy7t/5rglhwRieIydo 4Ut8aMZUH1coYcwUUZTaREISZUgK0eBu+HPFSze3FDjpOADpJQtSM7y+n2x2cjQho+ir mxKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708077073; x=1708681873; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Y2vHnI5LSLRE33MfHS1ReUQs4VrL3VJWSAdI/Ri9+mw=; b=Q6xJm33l0iayGWr37EBCKuppEnhooMb67+oDdmJw5umcfy989IS1thdPXmfBd9mVBr ivajkQ0rUIdYHZj0Dr6Aqtqa24odWva1EAVPpUIoWiCwSoMOLV3LEGV/ui06ssppcuH7 J7wcqc1ClhmeMoZ8QUtwe3Y30jY80MRINixBAX/4oZTJGREqKsh+qognM5cwSepwNTHe gYLgsDLPqJ5zgeMZo2wGWLRR9H+AR5bIJKAPSTXRCHXJJBZMdoOnU0tJrV/cZpYFeG/z Y7StEdXtxzB/jjnmUMNyaVup2lbkrsu51BUFoek3AZ8WLj0FTPHCZpm489PNoUntzXaV 6IbA== X-Gm-Message-State: AOJu0YycRB7TATKlyGedoHvfWSkd2GVffsEtDx0tX45iL5T3p8ecyZc9 XYtYlb+djDO4OsNrYJfdrpYILbrZ7HS/8dszq8az6ruUBK0NVi/el8fVmpm7ELBL4Q== X-Google-Smtp-Source: AGHT+IFTwCs2pTznLZJ82SbUjDhcvlz/NrKzcAMR4Y7uIhuLCFXev6otDwqhGTvJK3KFyyKrVECpbA== X-Received: by 2002:a05:6a00:1a8d:b0:6e0:84d4:e009 with SMTP id e13-20020a056a001a8d00b006e084d4e009mr4803464pfv.21.1708077072936; Fri, 16 Feb 2024 01:51:12 -0800 (PST) Received: from KASONG-MB2.tencent.com ([1.203.117.232]) by smtp.gmail.com with ESMTPSA id fc16-20020a056a002e1000b006e13bf2b955sm898709pfb.113.2024.02.16.01.51.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 16 Feb 2024 01:51:12 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , "Huang, Ying" , Chris Li , Minchan Kim , Yu Zhao , Barry Song , SeongJae Park , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , Yosry Ahmed , David Hildenbrand , stable@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v3] mm/swap: fix race when skipping swapcache Date: Fri, 16 Feb 2024 17:51:05 +0800 Message-ID: <20240216095105.14502-1-ryncsn@gmail.com> X-Mailer: git-send-email 2.43.0 Reply-To: Kairui Song MIME-Version: 1.0 X-Rspamd-Queue-Id: 197D6A0008 X-Rspam-User: X-Stat-Signature: ydpxyfkynd36g7xt7ic9xa8fpnn5is9m X-Rspamd-Server: rspam01 X-HE-Tag: 1708077075-774615 X-HE-Meta: U2FsdGVkX1/qwMQSM6xQJXkxUQtvhuygQS6zUKd7ZtFCvWVm11zky3sYWvuu6T6qZTb+8Zw+qh4cC1S5KRLzXTJSe11cgeQiUy2RmgMAUcM/cguR8p73ZcZnfltaJiktt1iIPKskc0UJ4mo5M0Q2kPk1OBBtGB2uXbgPZWsyIwmmgvuHvutLehaVvz0cSCPavMDvl/X6IxPgSLsb7teICBsrkdpHQVtn8CTNwr+jfihsRD7Rpo1SlMNoniSqx3szg8n7//XgpIa1U2hfmDHeIWlUUJoStylfT3SbWIUm7Z69s41B+6SxHh4pPNVUISep2mUHaIK2SiSEQ0NB5RyqR6X1IsWR4zs8ZoW4mnOa1stQSOx0ELYzCEN8sj9N/VNwH8DfsHidWph/NO1md24oHC9zsA5VcWh13iE58b9iOJAthNIFG+Tjhul2USZaL9drIcC0U57tWq/uGOv/L9XDigE4vARh1Cb2WFjP6Sd4KOes/rhXr9wBpzoVgI3njcSngtqzy+koVdK7bcoNhG5bzW/8VjFWWvgrvdIVHfVc93c8SJJU2TPhJZGFE8Ptf6R1w80JCaTBf1w79/M4WK3oH2HKDH5DTQUX21qIGHqLFKn/Vg86f7TUU1ebXcOTQxZ8CfSbGdHhyUX8l62OJ0MSWN28IGVT4PhB6mmkpiygo2AvVXJ3J6A9Lsp9GSQRRboko0k9/qYCPGqXggwL9vZph0q2ntZZ+fkvZQq0SRBHjYfsWb7xeBnG05nHeJfg8IRIwm+fpQIj1WbED27tq0mloEBbf8kz90a1ilvwXBqUGfNnBJJP2AaQBIi2HfBnwsmNMxx2Qx9y6ufBzORQHpFUgWWU6yCKXXnDd/Xp6ljkCzxFiE9F5acBJLppxh9Ayroowkx6Kh/h3TpCozg3+JqXeIDiVktSPy/Rc+lvNXNjsO5qfJE8c0VgoXxUjO5/k+FvFBV/oZaU2cv2ZyFDK9V pyCQNpGV brbIg7Pv5VfQl9Dkd3+lxnU/jzkXyxZFPLjXWMU8uLhtkLlZG1oJ3Wid0AxDkLMiAj33/oUm0lyBlG22cabLhAF9UUVvN55OyiSlx2x6kt+Fjqj4Y6og7t42MxlY5X94Eme/aBBtvIsO7ATbzvI9upfQ2SgW6fPlCIl1XqqgE42KpzqM8evv+nUs7PpD35w++DKvh6NrRMcFiRswxlxZtVFRGAqaOASdIRk+QXz5Bzl+5hw71oSVG0/rKABSAt0LamSGNAcdO0SSGRKE= 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: From: Kairui Song When skipping swapcache for SWP_SYNCHRONOUS_IO, if two or more threads swapin the same entry at the same time, they get different pages (A, B). Before one thread (T0) finishes the swapin and installs page (A) to the PTE, another thread (T1) could finish swapin of page (B), swap_free the entry, then swap out the possibly modified page reusing the same entry. It breaks the pte_same check in (T0) because PTE value is unchanged, causing ABA problem. Thread (T0) will install a stalled page (A) into the PTE and cause data corruption. One possible callstack is like this: CPU0 CPU1 ---- ---- do_swap_page() do_swap_page() with same entry swap_read_folio() <- read to page A swap_read_folio() <- read to page B ... set_pte_at() swap_free() <- entry is free pte_same() <- Check pass, PTE seems unchanged, but page A is stalled! swap_free() <- page B content lost! set_pte_at() <- staled page A installed! And besides, for ZRAM, swap_free() allows the swap device to discard the entry content, so even if page (B) is not modified, if swap_read_folio() on CPU0 happens later than swap_free() on CPU1, it may also cause data loss. To fix this, reuse swapcache_prepare which will pin the swap entry using the cache flag, and allow only one thread to pin it. Release the pin after PT unlocked. Racers will simply wait since it's a rare and very short event. A schedule() call is added to avoid wasting too much CPU or adding too much noise to perf statistics Other methods like increasing the swap count don't seem to be a good idea after some tests, that will cause racers to fall back to use the swap cache again. Parallel swapin using different methods leads to a much more complex scenario. Reproducer: This race issue can be triggered easily using a well constructed reproducer and patched brd (with a delay in read path) [1]: With latest 6.8 mainline, race caused data loss can be observed easily: $ gcc -g -lpthread test-thread-swap-race.c && ./a.out Polulating 32MB of memory region... Keep swapping out... Starting round 0... Spawning 65536 workers... 32746 workers spawned, wait for done... Round 0: Error on 0x5aa00, expected 32746, got 32743, 3 data loss! Round 0: Error on 0x395200, expected 32746, got 32743, 3 data loss! Round 0: Error on 0x3fd000, expected 32746, got 32737, 9 data loss! Round 0 Failed, 15 data loss! This reproducer spawns multiple threads sharing the same memory region using a small swap device. Every two threads updates mapped pages one by one in opposite direction trying to create a race, with one dedicated thread keep swapping out the data out using madvise. The reproducer created a reproduce rate of about once every 5 minutes, so the race should be totally possible in production. After this patch, I ran the reproducer for over a few hundred rounds and no data loss observed. Performance overhead is minimal, microbenchmark swapin 10G from 32G zram: Before: 10934698 us After: 11157121 us Non-direct: 13155355 us (Dropping SWP_SYNCHRONOUS_IO flag) Fixes: 0bcac06f27d7 ("mm, swap: skip swapcache for swapin of synchronous device") Link: https://github.com/ryncsn/emm-test-project/tree/master/swap-stress-race [1] Reported-by: "Huang, Ying" Closes: https://lore.kernel.org/lkml/87bk92gqpx.fsf_-_@yhuang6-desk2.ccr.corp.intel.com/ Signed-off-by: Kairui Song Cc: stable@vger.kernel.org Acked-by: David Hildenbrand --- Update from V2: - Add a schedule() if raced to prevent repeated page faults wasting CPU and add noise to perf statistics. - Use a bool to state the special case instead of reusing existing variables fixing error handling [Minchan Kim]. V2: https://lore.kernel.org/all/20240206182559.32264-1-ryncsn@gmail.com/ Update from V1: - Add some words on ZRAM case, it will discard swap content on swap_free so the race window is a bit different but cure is the same. [Barry Song] - Update comments make it cleaner [Huang, Ying] - Add a function place holder to fix CONFIG_SWAP=n built [SeongJae Park] - Update the commit message and summary, refer to SWP_SYNCHRONOUS_IO instead of "direct swapin path" [Yu Zhao] - Update commit message. - Collect Review and Acks. V1: https://lore.kernel.org/all/20240205110959.4021-1-ryncsn@gmail.com/ include/linux/swap.h | 5 +++++ mm/memory.c | 20 ++++++++++++++++++++ mm/swap.h | 5 +++++ mm/swapfile.c | 13 +++++++++++++ 4 files changed, 43 insertions(+) diff --git a/include/linux/swap.h b/include/linux/swap.h index 4db00ddad261..8d28f6091a32 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -549,6 +549,11 @@ static inline int swap_duplicate(swp_entry_t swp) return 0; } +static inline int swapcache_prepare(swp_entry_t swp) +{ + return 0; +} + static inline void swap_free(swp_entry_t swp) { } diff --git a/mm/memory.c b/mm/memory.c index 7e1f4849463a..7059230d0a54 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3799,6 +3799,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) struct page *page; struct swap_info_struct *si = NULL; rmap_t rmap_flags = RMAP_NONE; + bool need_clear_cache = false; bool exclusive = false; swp_entry_t entry; pte_t pte; @@ -3867,6 +3868,20 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (!folio) { if (data_race(si->flags & SWP_SYNCHRONOUS_IO) && __swap_count(entry) == 1) { + /* + * Prevent parallel swapin from proceeding with + * the cache flag. Otherwise, another thread may + * finish swapin first, free the entry, and swapout + * reusing the same entry. It's undetectable as + * pte_same() returns true due to entry reuse. + */ + if (swapcache_prepare(entry)) { + /* Relax a bit to prevent rapid repeated page faults */ + schedule(); + goto out; + } + need_clear_cache = true; + /* skip swapcache */ folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, vmf->address, false); @@ -4117,6 +4132,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (vmf->pte) pte_unmap_unlock(vmf->pte, vmf->ptl); out: + /* Clear the swap cache pin for direct swapin after PTL unlock */ + if (need_clear_cache) + swapcache_clear(si, entry); if (si) put_swap_device(si); return ret; @@ -4131,6 +4149,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) folio_unlock(swapcache); folio_put(swapcache); } + if (need_clear_cache) + swapcache_clear(si, entry); if (si) put_swap_device(si); return ret; diff --git a/mm/swap.h b/mm/swap.h index 758c46ca671e..fc2f6ade7f80 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -41,6 +41,7 @@ void __delete_from_swap_cache(struct folio *folio, void delete_from_swap_cache(struct folio *folio); void clear_shadow_from_swap_cache(int type, unsigned long begin, unsigned long end); +void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry); struct folio *swap_cache_get_folio(swp_entry_t entry, struct vm_area_struct *vma, unsigned long addr); struct folio *filemap_get_incore_folio(struct address_space *mapping, @@ -97,6 +98,10 @@ static inline int swap_writepage(struct page *p, struct writeback_control *wbc) return 0; } +static inline void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry) +{ +} + static inline struct folio *swap_cache_get_folio(swp_entry_t entry, struct vm_area_struct *vma, unsigned long addr) { diff --git a/mm/swapfile.c b/mm/swapfile.c index 556ff7347d5f..746aa9da5302 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3365,6 +3365,19 @@ int swapcache_prepare(swp_entry_t entry) return __swap_duplicate(entry, SWAP_HAS_CACHE); } +void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry) +{ + struct swap_cluster_info *ci; + unsigned long offset = swp_offset(entry); + unsigned char usage; + + ci = lock_cluster_or_swap_info(si, offset); + usage = __swap_entry_free_locked(si, offset, SWAP_HAS_CACHE); + unlock_cluster_or_swap_info(si, ci); + if (!usage) + free_swap_slot(entry); +} + struct swap_info_struct *swp_swap_info(swp_entry_t entry) { return swap_type_to_swap_info(swp_type(entry));