From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FAEAC3F2D1 for ; Tue, 3 Mar 2020 20:21:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4F9CC20842 for ; Tue, 3 Mar 2020 20:21:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="SJV5lLpR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F9CC20842 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 03B676B000C; Tue, 3 Mar 2020 15:21:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F2ED26B000D; Tue, 3 Mar 2020 15:21:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E42F66B000E; Tue, 3 Mar 2020 15:21:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0170.hostedemail.com [216.40.44.170]) by kanga.kvack.org (Postfix) with ESMTP id C9CB66B000C for ; Tue, 3 Mar 2020 15:21:18 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 1D1CE824934B for ; Tue, 3 Mar 2020 20:21:18 +0000 (UTC) X-FDA: 76555170636.06.gold84_7fbf3a212b11e X-HE-Tag: gold84_7fbf3a212b11e X-Filterd-Recvd-Size: 4210 Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Tue, 3 Mar 2020 20:21:17 +0000 (UTC) Received: by mail-ot1-f67.google.com with SMTP id j5so4364446otn.10 for ; Tue, 03 Mar 2020 12:21:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mwgO9cOowU4zuHwpbJmXttNfsLky+bg1fiQ3b/r6xjA=; b=SJV5lLpRMKqd31yWpeqPEGc7Sx+8lMOei7OauXUe71+7Oq7FO9M3WJuZcCm3zjrVF5 vWzuvNhyUTvPC41/K2x9nvH4SGnyNCbzuBJ912fx2tK297vn6ZG9ClXFde+Wb6KnFMk9 c9O1HhfoiMVe9ek4vOLYS8wbQxsE/p62YekUnRw+Y5sSPCYgKxo8AIMCS/a/+DNiOt0p xtMbJ7UIW/2nMntgSovpI1hlJPvj+LBx19OQu9rRKnwLq+8oA3Up9QcYxIUHX2asrvcV JETHcas1Cl4/klj1v5oW01k9GpG+6exyIf0sjr6yLN1ht3rgahELHxkpPsZp1clAZ48w kNDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mwgO9cOowU4zuHwpbJmXttNfsLky+bg1fiQ3b/r6xjA=; b=IbGPJN+X/xLzie4Bc8N02DYCX6YVK3GIa7PoUILP/VBN+WmH07xK3N74uSl9Z15pMb Ie9GeBuzHS0AyqKuCrjJ7UVgfpsEAxXkUKJl+LQwxkgzS/iTphniCPgOUSup5Iopw/NV uFYf+A0qgo+vLRGm6Qn9+Bwy5+gg5dt/6rNJFNlCMmRkypODAD98W69c7UhrTjP8Ubys MHUIvQdHy8S8g6P7B3LyMVq+yoNwHuMOVe+9kL7Ck2NanNEYAbEXsfzGPTWj55/6Ajiy RcD+mtdD99UhH2wPKOcA98An0XMy4Plk9bY9f6rVKPeZQZ6oOghjwjXFK/ILDi28/uaE EMRw== X-Gm-Message-State: ANhLgQ1T/t+qPymI3WuXOaj5RmjV0uvlaG8bVcLoeT/55tBhrNwqK6eR UU4RkOkXKbFrUnog/sFaFWBsqMIrT+er7lxPZylpjQ== X-Google-Smtp-Source: ADFU+vutrvovFXnBERiCdgpZT7u3ux90PiGT6B9OmcY9VzbHdIl5QVKE7cIVwDkZWQ1bNq3jvMqyFRRxqK/WoKMs3IY= X-Received: by 2002:a9d:7410:: with SMTP id n16mr4880028otk.23.1583266877139; Tue, 03 Mar 2020 12:21:17 -0800 (PST) MIME-Version: 1.0 References: <1583263716-25150-1-git-send-email-cai@lca.pw> <1583263716-25150-2-git-send-email-cai@lca.pw> In-Reply-To: <1583263716-25150-2-git-send-email-cai@lca.pw> From: Marco Elver Date: Tue, 3 Mar 2020 21:21:05 +0100 Message-ID: Subject: Re: [PATCH -next 2/2] Revert "mm/kmemleak: annotate various data races obj->ptr" To: Qian Cai Cc: Andrew Morton , catalin.marinas@arm.com, Linux Memory Management List , LKML Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Tue, 3 Mar 2020 at 20:28, Qian Cai wrote: > > This reverts commit a03184297d546c6531cdd40878f1f50732d3bac9. > > Signed-off-by: Qian Cai Acked-by: Marco Elver Thank you! > --- > 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 >