From patchwork Fri Feb 7 00:37:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11369407 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 6A74D921 for ; Fri, 7 Feb 2020 00:37:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 376AB21775 for ; Fri, 7 Feb 2020 00:37:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="cJvTqNLZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 376AB21775 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 7DCEA6B0006; Thu, 6 Feb 2020 19:37:24 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 78DBA6B0007; Thu, 6 Feb 2020 19:37:24 -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 6A3856B0008; Thu, 6 Feb 2020 19:37:24 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0217.hostedemail.com [216.40.44.217]) by kanga.kvack.org (Postfix) with ESMTP id 54B696B0006 for ; Thu, 6 Feb 2020 19:37:24 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id EEA75180AD801 for ; Fri, 7 Feb 2020 00:37:23 +0000 (UTC) X-FDA: 76461467166.25.bite21_7ac717a73a624 X-Spam-Summary: 2,0,0,10400f50f6b3c08b,d41d8cd98f00b204,cai@lca.pw,:akpm@linux-foundation.org:elver@google.com::linux-kernel@vger.kernel.org:cai@lca.pw,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1437:1515:1535:1542:1711:1730:1747:1777:1792:2393:2559:2562:2693:2892:2918:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3870:3872:4321:4605:5007:6238:6261:6653:7903:7904:8784:8957:9163:10004:11026:11473:11658:11914:12043:12297:12438:12517:12519:12555:12679:12740:12895:12986:13870:13894:14018:14104:14181:14394:14721:21067:21080:21324:21444:21451:21627:30029:30054:30056:30065:30075,0,RBL:209.85.222.194:@lca.pw:.lbl8.mailshell.net-62.2.0.100 66.100.201.201,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:24,LUA_SUMMARY:none X-HE-Tag: bite21_7ac717a73a624 X-Filterd-Recvd-Size: 5338 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Fri, 7 Feb 2020 00:37:23 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id 21so593454qki.5 for ; Thu, 06 Feb 2020 16:37:23 -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:mime-version :content-transfer-encoding; bh=PAJE+DlL3J3weFiTT/dGK70Va5HXR4vcbYkwDmRWC30=; b=cJvTqNLZ0AMzq5U1O950eoSCqVb9WfhhgOAsQdBpb+zVT5LhQiI37ydX+zQtbKywCc EE/sDD1N4boctWZzA824rrM42hfmLrtS0xNXKUjvjYKW6Jd6ArG8xFUK7IOhPkWiboNx 1O7IFVpGpuTDk+vD/hqj7Av+v+02QhgprecgCtvbHzME5ZBDYxSkztvfLKH6uWpCM71R HMq9cCtGxHN5WZiBvX5EhpsomFXMSU2PB8X9n8gOQBgBJxsigtiApnNK4QMnTrwzPe/1 LI4uide8Y/xf1E6IBmP6ceUNZrRciPrtGyoftyEsMVaWEFuNcquLmBHbd6s3pQmEVp/Y 6Jjw== 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:mime-version :content-transfer-encoding; bh=PAJE+DlL3J3weFiTT/dGK70Va5HXR4vcbYkwDmRWC30=; b=GBHG6nvy5gdNTO8IX318WJA3r5qO1JSqni1/aoBc4XOg4sqHPza1X+KejHd2iGp8AE D6AaiSBnlXgjy/kE+YZwQnZt8/PEpqnK5QKnaV5VBC+/AtP1tYp5i1GBQKwK7Q97tfIQ gRgKI4roMoP3DgB5wmb8w1G0HQxr2+cg2ZdDkVI0+oYu/tfSGeKvR9CgG/QeiE0ddVDn uw+YaRZb7bP6l4XcMCUZa+XBQXzwGhbqwAQ8LsaCfIX+t/ezqr0TcZo36RhTO2MTICrX ZR4TCK0yU8vkqvId7Zmj4u/nhfOwV3fPulXBdTYb3ZZeiTdobdbz9rkEQH6UJQmXklVF FUYw== X-Gm-Message-State: APjAAAWVFCUVkCRZU1we6mOuGKWd8yuK9E/RQoYl4Y1pUJ2C+mjgr52b KPMo1FOaw82tAoQhQgvn+FVZew== X-Google-Smtp-Source: APXvYqxIdlGbl8B/TbcF+soFldxIqLnKB7JRKjKC3trg6IbRVPP9H21xj9JXy/wF5hcEXXV0u2jTLA== X-Received: by 2002:a37:4a51:: with SMTP id x78mr4721626qka.445.1581035843100; Thu, 06 Feb 2020 16:37:23 -0800 (PST) Received: from ovpn-121-126.rdu2.redhat.com (pool-71-184-117-43.bstnma.fios.verizon.net. [71.184.117.43]) by smtp.gmail.com with ESMTPSA id z8sm534584qth.16.2020.02.06.16.37.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Feb 2020 16:37:22 -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 -next] mm/swap_state: mark various intentional data races Date: Thu, 6 Feb 2020 19:37:15 -0500 Message-Id: <20200207003715.1578-1-cai@lca.pw> X-Mailer: git-send-email 2.21.0 (Apple Git-122.2) MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000017, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: swap_cache_info.* could be accessed concurrently as noticed by KCSAN, BUG: KCSAN: data-race in lookup_swap_cache / lookup_swap_cache write to 0xffffffff85517318 of 8 bytes by task 94138 on cpu 101: lookup_swap_cache+0x12e/0x460 lookup_swap_cache at mm/swap_state.c:322 do_swap_page+0x112/0xeb0 __handle_mm_fault+0xc7a/0xd00 handle_mm_fault+0xfc/0x2f0 do_page_fault+0x263/0x6f9 page_fault+0x34/0x40 read to 0xffffffff85517318 of 8 bytes by task 91655 on cpu 100: lookup_swap_cache+0x117/0x460 lookup_swap_cache at mm/swap_state.c:322 shmem_swapin_page+0xc7/0x9e0 shmem_getpage_gfp+0x2ca/0x16c0 shmem_fault+0xef/0x3c0 __do_fault+0x9e/0x220 do_fault+0x4a0/0x920 __handle_mm_fault+0xc69/0xd00 handle_mm_fault+0xfc/0x2f0 do_page_fault+0x263/0x6f9 page_fault+0x34/0x40 Reported by Kernel Concurrency Sanitizer on: CPU: 100 PID: 91655 Comm: systemd-journal Tainted: G W O L 5.5.0-next-20200204+ #6 Hardware name: HPE ProLiant DL385 Gen10/ProLiant DL385 Gen10, BIOS A40 07/10/2019 write to 0xffffffff8d717308 of 8 bytes by task 11365 on cpu 87: __delete_from_swap_cache+0x681/0x8b0 __delete_from_swap_cache at mm/swap_state.c:178 read to 0xffffffff8d717308 of 8 bytes by task 11275 on cpu 53: __delete_from_swap_cache+0x66e/0x8b0 __delete_from_swap_cache at mm/swap_state.c:178 Both the read and write are done as lockless. Since swap_cache_info.* are only used to print out counter information, even if any of them missed a few incremental due to data races, it will be harmless, so just mark it as an intentional data race using the data_race() macro. While at it, fix a checkpatch.pl warning, WARNING: Single statement macros should not use a do {} while (0) loop Signed-off-by: Qian Cai --- mm/swap_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index 8e7ce9a9bc5e..c0fcae432bdf 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -58,8 +58,8 @@ static bool enable_vma_readahead __read_mostly = true; #define GET_SWAP_RA_VAL(vma) \ (atomic_long_read(&(vma)->swap_readahead_info) ? : 4) -#define INC_CACHE_INFO(x) do { swap_cache_info.x++; } while (0) -#define ADD_CACHE_INFO(x, nr) do { swap_cache_info.x += (nr); } while (0) +#define INC_CACHE_INFO(x) data_race(swap_cache_info.x++) +#define ADD_CACHE_INFO(x, nr) data_race(swap_cache_info.x += (nr)) static struct { unsigned long add_total;