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=-24.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 4E205C433DB for ; Tue, 2 Feb 2021 17:07:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1684464F8A for ; Tue, 2 Feb 2021 17:07:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237238AbhBBRHH (ORCPT ); Tue, 2 Feb 2021 12:07:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237024AbhBBREe (ORCPT ); Tue, 2 Feb 2021 12:04:34 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D355FC061573 for ; Tue, 2 Feb 2021 09:03:54 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id e15so2955927wme.0 for ; Tue, 02 Feb 2021 09:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=LlSpQiAeO5UD+cdMKYJ9CnM6vv6XdQSneSZu18Ir1hY=; b=TzVMfjf+ylnuHPTfEahpcfHvrwIKlOzm8kZ6UZxO8/PUZmMCmW8G3Z44hXndw8bnlq iIUZ760s/Zccd8nAfCYOIrPjTjWoYL0Ceqdqloz8lSNEmrBORIuJwNhBTaGSjddFDOcQ AnurNFHeaF6uVkEG+7173SHWXrgnoxhikvLZAPRZLggeZofIyBxtpGY8TJ+Pvhd1Z5d0 qtiIyk8KvQ/T8PO0kaJNGgPKxykmMEN1jHJcJE02d/Dbk3BQovpvLFXEzpW1WaF4vTFM 01cmHL8ufHxB1KMhOszwj2DzfFbsAYUsgg6T6kzX+A5/P3CWnlaLRKMe3W6ZhC3sQAJF 8DtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=LlSpQiAeO5UD+cdMKYJ9CnM6vv6XdQSneSZu18Ir1hY=; b=LtW9LL5U9rzJd6T0SEPFnyq8+an0EBZltrbOuEuDCjfPf81JGhI2QSNmjqqKSCzdIc 0o99WAXYIFvqzYmO+H2VGGtQs8o6kfC3XKn2WXVCmDb9zlI3D2tRgduYjVgfAbvhMi5n k4SpLn4AZ5A5Ai8DCXuZl5oWvQP+w8CT7fxcsT7yfCVkx5AALAijzLH9WmBsPIa4dI2W 9spCZu4V/NMhEiJ8salqg1ZHukZeNBiuKK/DguDoSDnZHYIcPcjqkvJra+gb8/db0UyM Zp9ie6DpcJZNkY2gDG1nu0gXYrD/Mf5F7pMv99X6Xa3MGKtHlVkGT+g+bo4KlNn44vDa tn0Q== X-Gm-Message-State: AOAM530rkLS68HfIlc+B3Vn5Xdbson+4BqBFYVY6SXMBT0W707JvWJky AHgvpmhvuhADwmYja4BzP+0kxw== X-Google-Smtp-Source: ABdhPJw7ncqblw1w7tWGFXv9BaZLz89rCTXcutCm2/LmNWfuj4bPNh3PMRTyPZbm2rD1CHhNptWiLA== X-Received: by 2002:a05:600c:4fc2:: with SMTP id o2mr4462198wmq.90.1612285433466; Tue, 02 Feb 2021 09:03:53 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id q63sm4041403wma.43.2021.02.02.09.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 09:03:52 -0800 (PST) Date: Tue, 2 Feb 2021 18:03:46 +0100 From: Marco Elver To: Andrey Konovalov Cc: Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Andrew Morton , Will Deacon , Andrey Ryabinin , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 04/12] kasan: clean up setting free info in kasan_slab_free Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.2 (2020-11-20) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 01, 2021 at 08:43PM +0100, Andrey Konovalov wrote: > Put kasan_stack_collection_enabled() check and kasan_set_free_info() > calls next to each other. > > The way this was previously implemented was a minor optimization that > relied of the the fact that kasan_stack_collection_enabled() is always > true for generic KASAN. The confusion that this brings outweights saving > a few instructions. > > Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver > --- > mm/kasan/common.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index a7eb553c8e91..086bb77292b6 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -350,13 +350,11 @@ static bool ____kasan_slab_free(struct kmem_cache *cache, void *object, > > kasan_poison(object, cache->object_size, KASAN_KMALLOC_FREE); > > - if (!kasan_stack_collection_enabled()) > - return false; > - > if ((IS_ENABLED(CONFIG_KASAN_GENERIC) && !quarantine)) > return false; > > - kasan_set_free_info(cache, object, tag); > + if (kasan_stack_collection_enabled()) > + kasan_set_free_info(cache, object, tag); > > return kasan_quarantine_put(cache, object); > } > -- > 2.30.0.365.g02bc693789-goog >