From patchwork Mon Feb 5 11:09:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kairui Song X-Patchwork-Id: 13545268 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 B63AAC4828D for ; Mon, 5 Feb 2024 11:10:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0AAF96B0078; Mon, 5 Feb 2024 06:10:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 05B886B007B; Mon, 5 Feb 2024 06:10:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E64486B007D; Mon, 5 Feb 2024 06:10:37 -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 D747A6B0078 for ; Mon, 5 Feb 2024 06:10:37 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8AF6EC0438 for ; Mon, 5 Feb 2024 11:10:37 +0000 (UTC) X-FDA: 81757482114.23.1EECDFF Received: from mail-oo1-f47.google.com (mail-oo1-f47.google.com [209.85.161.47]) by imf13.hostedemail.com (Postfix) with ESMTP id A47C020016 for ; Mon, 5 Feb 2024 11:10:34 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Hrf9Zt7+; spf=pass (imf13.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.161.47 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=1707131434; 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=znkG0W/faimtWk9DtMNAMPJpERguc8HoaHMX5yV02eA=; b=25gJ0zZxVU2pL+Qj7FHM4IvgPL5RSY6Ub2wjeWh/iModKl5antDbYumK6A27e39HyfTnKn wl38FBoOXM8vWCCi+T4pDHR54DMQ8xNsKU1vH0MduDKCOztIV/D6agmplCeMDcWniEZMVG 6nP4dat0LcYhDIeSjhxYpuselxB7I64= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707131434; a=rsa-sha256; cv=none; b=eDOlnOar7psbJxpSeGLWiS/oDcb20Uryhz1fK577awGTxJCMlUTWnNmYRy4SFLsqabck41 c4DY30CxjQC1cC8WtEdW5G1gF/bJK8UcsT2l12UAUtvu9vXxawgrpoKcuQ/aHZK/rypiRf gj4pTvqeFQzdI8upfaSabcftN9Y3W1Y= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Hrf9Zt7+; spf=pass (imf13.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.161.47 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oo1-f47.google.com with SMTP id 006d021491bc7-595aa5b1fe0so2927114eaf.2 for ; Mon, 05 Feb 2024 03:10:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707131432; x=1707736232; 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=znkG0W/faimtWk9DtMNAMPJpERguc8HoaHMX5yV02eA=; b=Hrf9Zt7+dsT9B97CiPzxerVlu1TWdXeZqaxbiuSWdcSHbE9VKimnxHCyXJVT/zKgAn vHDEWvdlZB6nZdgLaSQSz5sqlEdXg1KYNEfYoLAYFUSHGaKu4+a/voncj9FIyMWcLcq+ miG98x6zRjAnA0H4uO2rgC7WRNKH43oerDBD2SnK5EjyLp5ZcGQNG/B9dcuhWbmyC4Ep abTqSBl4WXmCjytgWlb7fGmJeA/5QtoSDv35E4qd/ygPe/VN+ojOi+N4T3q6bgq25cM/ d1aoIvyWftMj3ads/vtsRnxRA4c+DjYfv9i1Kpsg2PxjkpPg8kxpifja9awSmVl4Qx2B jUmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707131432; x=1707736232; 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=znkG0W/faimtWk9DtMNAMPJpERguc8HoaHMX5yV02eA=; b=CK1GrRfcxu0yBlYilboT/vYapGcKVJWuWDmb50hqszmtbGK7EdxrSx37vHuNWlXNlL wyzXQ6JRTE+UtCSPvTAuJpNnqJFwejGptEihCfQoUcd+CuLSVQpyYJdCjAcrXveHQ+lm FvMrU64pl3LTLpTRVZwgkgfLegw9Ox7QZnoEGgbEQMGdcoZwIuetXcfFpdsisAK9BIAE JnbP0+5KS+PrAFi8V0uKSNsNJNEJk7Dig8WHd7deGthvk8ycqYvBbeiqNnef/yH/8RBD xGLQLSYTyy9ISZwA98obl2a6SgIFDiQh3nCaxTsEvCtsEhZbisr4fHTjMPLJEVyWAqwI c8jg== X-Gm-Message-State: AOJu0Yzzw4WV1CsByWeRfvZMgg9PvPXs2Ef04TlZlgKyMMBVDQI17bu8 d1Imbm99dN/Zkwa15BR7Sc7KxiALNLCKl1sM70D8MypPZJ2xalFOUHoAI2s6Jwsututu X-Google-Smtp-Source: AGHT+IHQ9Q8046bQVtEk8K5lVJ+hLKWsPWhs2z4DES8voFDh08JPKRMGyWERvQeXH4ZbRUxqPzi/8g== X-Received: by 2002:a05:6358:290d:b0:176:a01d:7889 with SMTP id y13-20020a056358290d00b00176a01d7889mr15491494rwb.30.1707131432415; Mon, 05 Feb 2024 03:10:32 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVzcW31kd/ZTjZvFA7UJ/RFsXVXK6O8BjnA4HI23U3dBpGqOsuQWz5vuF5pXuTOWR9MeAdAHCJawLRGqD5ppoDpt5lO8kdIoe3OYyIRGBh8ly8kzOdJ+wHFWTYht66DyROlw/aYW4dhrNiA/TygbIp2FzuM5VOrN1rTrq+4VOP5s4hOdKSBwSiJxEYBbjoygvJd59u/URxwILc50NBdEykUyYd+6CD3O7lgw81oatlbO/1NTvv+WJWPqp4ChjNx14AzdyjbVdNDqYOR6UyBSui1HjiJu5sYdNb3SwpjpYFdjMRuS2bkA1Q27VQqLBuBCsptZ8/u5irIpe0ipPeCUUsiNWcUqwHBOlYlPqw7bzW6E19fFLLpVBYBaXpWVRmZyKQzgVhL2w== Received: from KASONG-MB2.tencent.com ([114.254.2.8]) by smtp.gmail.com with ESMTPSA id g37-20020a635665000000b005d748902a01sm6661064pgm.43.2024.02.05.03.10.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 05 Feb 2024 03:10:31 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , "Huang, Ying" , Chris Li , Minchan Kim , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , Yosry Ahmed , David Hildenbrand , Yu Zhao , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH] mm/swap: fix race condition in direct swapin path Date: Mon, 5 Feb 2024 19:09:59 +0800 Message-ID: <20240205110959.4021-1-ryncsn@gmail.com> X-Mailer: git-send-email 2.43.0 Reply-To: Kairui Song MIME-Version: 1.0 X-Rspamd-Queue-Id: A47C020016 X-Rspam-User: X-Stat-Signature: tamobkhd8zbzk6863bx1dcr1xa8f3qct X-Rspamd-Server: rspam03 X-HE-Tag: 1707131434-664535 X-HE-Meta: U2FsdGVkX19QRUQWpSKwKQVHJqofiCRqg8AkZpUHo42cjcWNiFQyi3QcAOHwh58LOoNYYl84gjfro6jOFcIZPD0xIsg7j5+hPt3S7Ch8gmThc8CZIfQk90xAuVnUdEp+qIIvGZb5fMOqZ7bTkjJP/u5mDZFyQSiLizF5IPnmRMjsOUaHbAZYdDk5BKcFxIE1kd7gsCybMkH4yyAzI8SkON+sKRsl1e0kZ5beFUivLtTwn9+9sHW163Mui1sBH0qS6rI6VcZ9xfln0s/GjmcToJv46OEJxVB4vdiL+AVY61e8XTSY/3R1D+j3NxdQ0XUW0ZnkU+fTPWfjoii3sKmRMO1Yxsn5rsBJoCWZuO0BFtj06i/XsH9AYgTlnC7NCiVkrK2+kmOpyL0gwDjEod6jU1l8DToi02S2SIcPek+EVojXfdxBSvGN+FxNnRvFMuU5A78wisH3xXptGunZeIPkbBKZ32xQCheWGPlkKm5c0PqZQJY486mdZEehpJXR0De8bx0rBaykaAy/HbMHK3l8VU1PBUfbzMgKlmi/Ui8u62xZEYawTKefHMv3kyXPtR0Xp4sCVju+qe4pUKB3qoMnnSeWcE0YeDCHe418GMKWbM+MyNXHdKs8eLwmNA0qTKDdDzMXFdjvc1yR8l9dBJ9Ip5deMXIehDmIEeCzOylTR5JJz/uwUt4Zexx8v9Yp2uuB1+1vc7muTIIE3//usAMwTCzt7hCu/Z0F5nRAsvTO+hZzATeHlCb0ZbrlNJNsssxA0EfemcweB9NKfSS1SP/gCA4BENKAG1KZWszZWi3RdGHdmQaTz1hAyyNAoQYbZcZhfzUref/cWkAIIwCkKiemRFDKiOz/u34A9KymZyDLIBm970qoC9U+DMuFrRI2lNbvaWcoZLG1ojUWRZoXoTX0i9X69mxKyEEjFFU+XTSFfFxvc80H9cMJM6rYi2euoDcsvV2/lFfBcsDp1rw1Z6/ tXmalXV2 F7G2FadGqO9ehewg3AiRyIjJOrCWrkA8174sAkMUtumac699Fh2L/BtfDshvIRTzghq3zsc9i7ZQQYWbF95oRojAZfGt9iE5zA0gCjMe5+arkIKdVQI6eoExxA3THSISJxuAwmcM7xBx9N+GhmJEURirdCiKxhoEpJTdlodNVWn/4Wsp556LeZWC/bQTzOFbaFEg9zFLhjIBdXmdUeg939C2Pm/rEzr8FqKd6DCxXJOvKgPOcHcTVdiIuGnXgf720lC96mFNwKaFleRCBxetIGT0kiiDfSYolftncfTvM7LVCfm7OgBoEDWzWTkETzjd3rAOX7590v4DLK3cgpoEeDk5wd9QLQBWmy7u7CxPMjhamdudS74A9HmpYiDgEFpKgNqbKZLAWOvV9jFWYbQQK4R+qtnrM34I3/986TUPFKq67YK4kgxtCU1iHiyVE26NlD+HnVltcH6JLHd7WRXETgLVzymxpTazKKZ0J+BwImKsc/r7BzQhM5+y+kaa7AyLcnC+FL5trUlt55mClJRaNbsS4n72wivH+N2sDMa9jZqnklyylQHdGR32hJcNAyCEQeJZQjv2/kLUV5ZkG7wW+1D8Oqc8XVZ4cRj/tPcnvvNxr/UFRg1glF5PAMgf2JmKnOL7pi0HP6NdmmjGFNiiH25SXKA== 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 In the direct swapin path, when two or more threads swapin the same entry at the same time, they get different pages (A, B) because swap cache is skipped. 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 modify and swap-out the page again, using the same entry. It break the pte_same check because PTE value is unchanged, causing ABA problem. Then thread (T0) will then install the stalled page (A) into the PTE so new data in page (B) is lost, one possible callstack is like this: CPU0 CPU1 ---- ---- do_swap_page() do_swap_page() with same entry swap_readpage() <- read to page A swap_readpage() <- read to page B ... set_pte_at() swap_free() <- Now the entry is freed. 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! 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 busy wait since it's a rare and very short event. 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 the cached swapin path, two swapin path being used at the same time 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] Signed-off-by: Kairui Song Reported-by: "Huang, Ying" Reviewed-by: "Huang, Ying" Acked-by: Yu Zhao --- Huge thanks to Huang Ying and Chris Li for help finding this issue! mm/memory.c | 19 +++++++++++++++++++ mm/swap.h | 5 +++++ mm/swapfile.c | 16 ++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index 7e1f4849463a..fd7c55a292f1 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3867,6 +3867,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) { + /* + * With swap count == 1, after we read the entry, + * other threads could finish swapin first, free + * the entry, then swapout the modified page using + * the same entry. Now the content we just read is + * stalled, and it's undetectable as pte_same() + * returns true due to entry reuse. + * + * So pin the swap entry using the cache flag even + * cache is not used. + */ + if (swapcache_prepare(entry)) + goto out; + /* skip swapcache */ folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, vmf->address, false); @@ -4116,6 +4130,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) unlock: if (vmf->pte) pte_unmap_unlock(vmf->pte, vmf->ptl); + /* Clear the swap cache pin for direct swapin after PTL unlock */ + if (folio && !swapcache) + swapcache_clear(si, entry); out: if (si) put_swap_device(si); @@ -4124,6 +4141,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (vmf->pte) pte_unmap_unlock(vmf->pte, vmf->ptl); out_page: + if (!swapcache) + swapcache_clear(si, entry); folio_unlock(folio); out_release: folio_put(folio); 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..f7d4ad152a7f 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3365,6 +3365,22 @@ int swapcache_prepare(swp_entry_t entry) return __swap_duplicate(entry, SWAP_HAS_CACHE); } +/* + * Clear the cache flag and release pinned entry. + */ +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));