Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Qian Cai <cai@lca.pw>
To:     akpm@linux-foundation.org
Cc:     elver@google.com, catalin.marinas@arm.com, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, Qian Cai <cai@lca.pw>
Subject: [PATCH -next 2/2] Revert "mm/kmemleak: annotate various data races obj->ptr"
Date:   Tue,  3 Mar 2020 14:28:36 -0500
Message-Id: <1583263716-25150-2-git-send-email-cai@lca.pw>
In-Reply-To: <1583263716-25150-1-git-send-email-cai@lca.pw>
References: <1583263716-25150-1-git-send-email-cai@lca.pw>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

This reverts commit a03184297d546c6531cdd40878f1f50732d3bac9.

Signed-off-by: Qian Cai <cai@lca.pw>
---
 mm/kmemleak.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 788dc5509539..e362dc3d2028 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1169,12 +1169,7 @@ static bool update_checksum(struct kmemleak_object *object)
 	u32 old_csum = object->checksum;
 
 	kasan_disable_current();
-	/*
-	 * crc32() will dereference object->pointer. If an unstable value was
-	 * returned due to a data race, it will be corrected in the next scan.
-	 */
-	object->checksum = data_race(crc32(0, (void *)object->pointer,
-					   object->size));
+	object->checksum = crc32(0, (void *)object->pointer, object->size);
 	kasan_enable_current();
 
 	return object->checksum != old_csum;
@@ -1248,7 +1243,7 @@ static void scan_block(void *_start, void *_end,
 			break;
 
 		kasan_disable_current();
-		pointer = data_race(*ptr);
+		pointer = *ptr;
 		kasan_enable_current();
 
 		untagged_ptr = (unsigned long)kasan_reset_tag((void *)pointer);
-- 
1.8.3.1