From patchwork Wed Jan 29 04:20:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11355483 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 EDE571395 for ; Wed, 29 Jan 2020 04:20:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AA7352468A for ; Wed, 29 Jan 2020 04:20:31 +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="tBAYxoa0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA7352468A 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 E0BA96B0005; Tue, 28 Jan 2020 23:20:30 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DBBFF6B0006; Tue, 28 Jan 2020 23:20:30 -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 CD2A66B0007; Tue, 28 Jan 2020 23:20:30 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0088.hostedemail.com [216.40.44.88]) by kanga.kvack.org (Postfix) with ESMTP id BB6056B0005 for ; Tue, 28 Jan 2020 23:20:30 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 59D6D82499A8 for ; Wed, 29 Jan 2020 04:20:30 +0000 (UTC) X-FDA: 76429370220.21.songs00_5ba9b29ba090d X-Spam-Summary: 2,0,0,d683ac9de7e1d0ca,d41d8cd98f00b204,cai@lca.pw,:akpm@linux-foundation.org:hannes@cmpxchg.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:2918:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3870:3871:4321:5007:6261:6653:7903:10004:11026:11473:11658:11914:12043:12296:12297:12438:12517:12519:12555:12679:12694:12737:12895:12986:13161:13229:13894:14018:14093:14096:14104:14181:14394:14721:21080:21444:21451:21524:21627:21990:30054:30065,0,RBL:209.85.160.196:@lca.pw:.lbl8.mailshell.net-62.14.0.100 66.201.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:45,LUA_SUMMARY:none X-HE-Tag: songs00_5ba9b29ba090d X-Filterd-Recvd-Size: 5511 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Wed, 29 Jan 2020 04:20:29 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id w8so12223766qts.11 for ; Tue, 28 Jan 2020 20:20:29 -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=YM4OJsNfZ+Cg/1QyXpcZd//8p772lihOuiLpGLKYKgo=; b=tBAYxoa0LP9S6BVo0xwNO6RFKmWwFseh0I4ad83I/ovAIpLNwY3jGjSbvb8/EE11jA 322Jc3BAu4ampLF0Kl0KZdrvmplWNQ+pwXTMicz0kgsot56ugzrbCVtzGj8NA72lopiF IXNVRujAb/kjdeh3Wjnw3iylsl2vKXQv9YpJsJNECeT2Xsh3nZfOIx8OLTL0QRSymD9o s4R79a+qgLO7MTiQ7Zwo9BsRq/+siFKiMK1W+Zt7aTRzKW1JWLmLHo4ZWdX9rzLaTRLf 192X3yGqDaGtIqNcgVLoBFpvyCobAD4pFybkMYtPChUyGuhI0xW6Qai35x1YL8aR0mOc 6IfQ== 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=YM4OJsNfZ+Cg/1QyXpcZd//8p772lihOuiLpGLKYKgo=; b=ZAa+ZDRbLu3/5ffZm/t+SHlhh02Jkk+UpbZIKDdMXDn4/yCLi/44UHKv8BDLKhLcwM JaaWUGsO49d8ABUpurfDc3u0jGjYOpK9kA9JDtj8T9e7f9Ubu72a/CqxKM+WXNnAx8RW TiDsYZRU8XzdME65VvfIj3YeZQQpx2MvCNDTIqctYGK77vjOp8rrrK1D+PqzqoQsuSHO Kia0RQ/BsLS2Y8AZSr+E3dnMTsB5s5rS8oHfiL9DlkcN9XAUxEoqrqgs98CR3RvKGXGf OtLx31cX9Bw3PGCui6lN2fEN1HxG+qxWotsBZovrYYaSPMmK2GwQjGZ1SkT1eHF/WHlD t3jQ== X-Gm-Message-State: APjAAAU3LgIV+2bMlCFmAjHRcr7ogbSAO9bAT3ogip/fVg48DfrZ/5BI xplGxavdBiJsnUp9UoDFJegYbA== X-Google-Smtp-Source: APXvYqxNOUDfMDbEmpgP46ytX31I8ri4xVc/Mgt9EiYdhovVnqIvbJLp4JcBOFq+G4DAiJFilo9jug== X-Received: by 2002:ac8:6f5b:: with SMTP id n27mr14407953qtv.96.1580271628969; Tue, 28 Jan 2020 20:20:28 -0800 (PST) Received: from ovpn-120-127.rdu2.redhat.com (pool-71-184-117-43.bstnma.fios.verizon.net. [71.184.117.43]) by smtp.gmail.com with ESMTPSA id i28sm487275qtc.57.2020.01.28.20.20.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jan 2020 20:20:28 -0800 (PST) From: Qian Cai To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, elver@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH -next] mm/page_counter: mark intentional data races Date: Tue, 28 Jan 2020 23:20:19 -0500 Message-Id: <20200129042019.3632-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.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The commit 3e32cb2e0a12 ("mm: memcontrol: lockless page counters") had memcg->memsw->failcnt and ->watermark could be accessed concurrently as reported by KCSAN, Reported by Kernel Concurrency Sanitizer on: BUG: KCSAN: data-race in page_counter_try_charge / page_counter_try_charge read to 0xffff8fb18c4cd190 of 8 bytes by task 1081 on cpu 59: page_counter_try_charge+0x4d/0x150 mm/page_counter.c:138 try_charge+0x131/0xd50 __memcg_kmem_charge_memcg+0x58/0x140 __memcg_kmem_charge+0xcc/0x280 __alloc_pages_nodemask+0x1e1/0x450 alloc_pages_current+0xa6/0x120 pte_alloc_one+0x17/0xd0 __pte_alloc+0x3a/0x1f0 copy_p4d_range+0xc36/0x1990 copy_page_range+0x21d/0x360 dup_mmap+0x5f5/0x7a0 dup_mm+0xa2/0x240 copy_process+0x1b3f/0x3460 _do_fork+0xaa/0xa20 __x64_sys_clone+0x13b/0x170 do_syscall_64+0x91/0xb47 entry_SYSCALL_64_after_hwframe+0x49/0xbe write to 0xffff8fb18c4cd190 of 8 bytes by task 1153 on cpu 120: page_counter_try_charge+0x5b/0x150 mm/page_counter.c:139 try_charge+0x131/0xd50 mem_cgroup_try_charge+0x159/0x460 mem_cgroup_try_charge_delay+0x3d/0xa0 wp_page_copy+0x14d/0x930 do_wp_page+0x107/0x7b0 __handle_mm_fault+0xce6/0xd40 handle_mm_fault+0xfc/0x2f0 do_page_fault+0x263/0x6f9 page_fault+0x34/0x40 Since the failcnt and watermark are tolerant of some inaccuracy, a data race will not be harmful, thus mark them as intentional data races with the data_race() macro. Signed-off-by: Qian Cai --- mm/page_counter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/page_counter.c b/mm/page_counter.c index de31470655f6..13934636eafd 100644 --- a/mm/page_counter.c +++ b/mm/page_counter.c @@ -82,8 +82,8 @@ void page_counter_charge(struct page_counter *counter, unsigned long nr_pages) * This is indeed racy, but we can live with some * inaccuracy in the watermark. */ - if (new > c->watermark) - c->watermark = new; + if (data_race(new > c->watermark)) + data_race(c->watermark = new); } } @@ -126,7 +126,7 @@ bool page_counter_try_charge(struct page_counter *counter, * This is racy, but we can live with some * inaccuracy in the failcnt. */ - c->failcnt++; + data_race(c->failcnt++); *fail = c; goto failed; } @@ -135,8 +135,8 @@ bool page_counter_try_charge(struct page_counter *counter, * Just like with failcnt, we can live with some * inaccuracy in the watermark. */ - if (new > c->watermark) - c->watermark = new; + if (data_race(new > c->watermark)) + data_race(c->watermark = new); } return true;