From patchwork Mon Feb 24 21:15:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11401695 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E33E713A4 for ; Mon, 24 Feb 2020 21:15:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B056F20CC7 for ; Mon, 24 Feb 2020 21:15:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="YGDYAR/H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B056F20CC7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lca.pw Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E4C576B0087; Mon, 24 Feb 2020 16:15:17 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DFDC56B0092; Mon, 24 Feb 2020 16:15:17 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D12F06B0096; Mon, 24 Feb 2020 16:15:17 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0144.hostedemail.com [216.40.44.144]) by kanga.kvack.org (Postfix) with ESMTP id B7BBD6B0087 for ; Mon, 24 Feb 2020 16:15:17 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 67CC0181AC9BF for ; Mon, 24 Feb 2020 21:15:17 +0000 (UTC) X-FDA: 76526276274.18.chalk79_856ff0a84744c X-Spam-Summary: 2,0,0,8048563bc04fc220,d41d8cd98f00b204,cai@lca.pw,,RULES_HIT:41:355:379:541:800:960:966:988:989:1260:1345:1437:1535:1542:1711:1730:1747:1777:1792:2196:2199:2393:2559:2562:2918:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3870:3872:3874:4385:4605:5007:6261:6653:7903:10004:11026:11473:11658:11914:12043:12297:12438:12517:12519:12555:12895:13161:13229:14018:14096:14104:14181:14394:14721:21067:21080:21220:21324:21444:21627:21990:30054,0,RBL:209.85.222.196:@lca.pw:.lbl8.mailshell.net-66.201.201.201 62.14.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:66,LUA_SUMMARY:none X-HE-Tag: chalk79_856ff0a84744c X-Filterd-Recvd-Size: 5072 Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Mon, 24 Feb 2020 21:15:16 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id j8so10001236qka.11 for ; Mon, 24 Feb 2020 13:15:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id; bh=DnXw4rV9XlLkkel27q1Q4AsygHSvBzv4JLeZBnmaX8c=; b=YGDYAR/HjFbF3I8nfpGekdnfwZPxTEoGZg3FEWErtSuUFk/9u01yID2D7wXWWdGi0B GBY9bEmIAjHqjkwj7vpI7yOPmbOmx+x0VkhEcMXudKGlZW+S9o3dnKz96jgvRg3fA6w0 ez/5vw08KiQN2+w7hgFTDoR9Sp5+VKw/OToCx10FwX1vi8kdKhn3iuc+ToOY7lF7gGFp C3ekvNjpjdOrhzpgRG4MO2+aRmm08gsEnZJ5dqmbn1efPaHkVvv+IppnQPkLg8wdVJs1 BGydfyjsUaSlcoC6zzU2xzOr1GYr+nUKhZ958di+ImaxrgzCQgLE7bktx9l26ru2JXek if7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DnXw4rV9XlLkkel27q1Q4AsygHSvBzv4JLeZBnmaX8c=; b=Gl06AxF9QcZMevm00QLcmxhEJbXmNdnq5+CeUJbfKgP/C3xyHANpn8ysD7hBXrTzBG eIXljaYDY7hfphxbH+AOUkNDajjOq7z1Gor1XNh6ZpJAbKcJp7J9Lka8UcB0vMbusUlT FYnjr4/3Z89Eadh8fO/OCDtu5Xh7cfEQ+r8d+iuI0p3w3plooo78WVgZiaqdUDhI/A2+ P1OhhtWi6rWiiuS2yLoXa3JZzLMwoeQqnggtqb3Y9KRPbP6QIzdVgmkzq7YiiAE3H8lL x2IW8EfuFeax4s26XmPM9PoqLWmIuliszZnu4iNFAzSd3vAbC8mZjHGobgb00iYBKw29 6bkw== X-Gm-Message-State: APjAAAVugj0MgTLSYYUntvzg5r7ChPp0zQrExPbGOydp1udtIMHNd1I/ qeSy9J1mzKIFW4dcvv9nJHCz9Q== X-Google-Smtp-Source: APXvYqwGyW40OLcE8bLxFgI2b5iHxJI9XJfUFtphi6qAxsNl5flzorvxiNMu7+OD9FljkUR5jnDZsg== X-Received: by 2002:a37:de0b:: with SMTP id h11mr51158132qkj.274.1582578915936; Mon, 24 Feb 2020 13:15:15 -0800 (PST) Received: from qcai.nay.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id 132sm6388381qkn.109.2020.02.24.13.15.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Feb 2020 13:15:14 -0800 (PST) From: Qian Cai To: akpm@linux-foundation.org Cc: elver@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH] mm/swapfile: fix data races in try_to_unuse() Date: Mon, 24 Feb 2020 16:15:03 -0500 Message-Id: <1582578903-29294-1-git-send-email-cai@lca.pw> X-Mailer: git-send-email 1.8.3.1 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: si->inuse_pages could be accessed concurrently as noticed by KCSAN, write to 0xffff98b00ebd04dc of 4 bytes by task 82262 on cpu 92: swap_range_free+0xbe/0x230 swap_range_free at mm/swapfile.c:719 swapcache_free_entries+0x1be/0x250 free_swap_slot+0x1c8/0x220 __swap_entry_free.constprop.19+0xa3/0xb0 free_swap_and_cache+0x53/0xa0 unmap_page_range+0x7e0/0x1ce0 unmap_single_vma+0xcd/0x170 unmap_vmas+0x18b/0x220 exit_mmap+0xee/0x220 mmput+0xe7/0x240 do_exit+0x598/0xfd0 do_group_exit+0x8b/0x180 get_signal+0x293/0x13d0 do_signal+0x37/0x5d0 prepare_exit_to_usermode+0x1b7/0x2c0 ret_from_intr+0x32/0x42 read to 0xffff98b00ebd04dc of 4 bytes by task 82499 on cpu 46: try_to_unuse+0x86b/0xc80 try_to_unuse at mm/swapfile.c:2185 __x64_sys_swapoff+0x372/0xd40 do_syscall_64+0x91/0xb05 entry_SYSCALL_64_after_hwframe+0x49/0xbe The plain reads in try_to_unuse() are outside si->lock critical section which result in data races that could be dangerous to be used in a loop. Fix them by adding READ_ONCE(). Signed-off-by: Qian Cai --- mm/swapfile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index a65622eec66f..36fd1536a83d 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2137,7 +2137,7 @@ int try_to_unuse(unsigned int type, bool frontswap, swp_entry_t entry; unsigned int i; - if (!si->inuse_pages) + if (!READ_ONCE(si->inuse_pages)) return 0; if (!frontswap) @@ -2153,7 +2153,7 @@ int try_to_unuse(unsigned int type, bool frontswap, spin_lock(&mmlist_lock); p = &init_mm.mmlist; - while (si->inuse_pages && + while (READ_ONCE(si->inuse_pages) && !signal_pending(current) && (p = p->next) != &init_mm.mmlist) { @@ -2182,7 +2182,7 @@ int try_to_unuse(unsigned int type, bool frontswap, mmput(prev_mm); i = 0; - while (si->inuse_pages && + while (READ_ONCE(si->inuse_pages) && !signal_pending(current) && (i = find_next_to_unuse(si, i, frontswap)) != 0) { @@ -2224,7 +2224,7 @@ int try_to_unuse(unsigned int type, bool frontswap, * been preempted after get_swap_page(), temporarily hiding that swap. * It's easy and robust (though cpu-intensive) just to keep retrying. */ - if (si->inuse_pages) { + if (READ_ONCE(si->inuse_pages)) { if (!signal_pending(current)) goto retry; retval = -EINTR;