Message ID | ece9cd2cca38dd3797c6cd1756e30a2e40b0d451.1612538932.git.andreyknvl@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=fALz=HH=kvack.org=owner-linux-mm@kernel.org> 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=-16.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 1DC10C433DB for <linux-mm@archiver.kernel.org>; Fri, 5 Feb 2021 15:39:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A4B04650F5 for <linux-mm@archiver.kernel.org>; Fri, 5 Feb 2021 15:39:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A4B04650F5 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 343A36B0073; Fri, 5 Feb 2021 10:39:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F66C6B0074; Fri, 5 Feb 2021 10:39:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E6BB6B0075; Fri, 5 Feb 2021 10:39:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0098.hostedemail.com [216.40.44.98]) by kanga.kvack.org (Postfix) with ESMTP id 09BA26B0073 for <linux-mm@kvack.org>; Fri, 5 Feb 2021 10:39:29 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id CEEEE824999B for <linux-mm@kvack.org>; Fri, 5 Feb 2021 15:39:28 +0000 (UTC) X-FDA: 77784623616.09.cloud36_5102c6d275e5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id B844D180AD807 for <linux-mm@kvack.org>; Fri, 5 Feb 2021 15:39:28 +0000 (UTC) X-HE-Tag: cloud36_5102c6d275e5 X-Filterd-Recvd-Size: 4588 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf04.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Fri, 5 Feb 2021 15:39:28 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id m64so6146974qke.12 for <linux-mm@kvack.org>; Fri, 05 Feb 2021 07:39:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=p2PHZd2SW9nz4o7+ZB1C3vkb9xhx8DH7M49Qc2p69KA=; b=lF3JI1Wz7SI+mSyZFHoJHyreQdSUTq5QY643cGS9GBBxjPRvwFD+iqezyeavSwGDTF uMprUNPCKb6jIjNQ9H27Fur8RtWhiDepPMiibytUc1NJTu0f7IFzzowNuNjrqBgmlLiv 7Tr4SU49efZvmHAiHw87MpqB2rqt/EdI6B3iqynlt/57vW11+kQCzeiLS4vtTtF/ES7x 3KkjctyAS2VhFEOvDpZJ0NSt8AamjRfvI1fi97PPs+ONtwsp9zEj2O5BeVMpwlZmNVVm vJzDRFXwJbhi9UAyMxR5Qu1VM7ormDH+bsHuZ7T8/e7tIEZCLXPYodKzTASn4vvBqtYJ 5c/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=p2PHZd2SW9nz4o7+ZB1C3vkb9xhx8DH7M49Qc2p69KA=; b=VFOwI19XhyXncXV5v5NrkBoDDfvLjddTgKSVoyO4ymkk8SgWmoSTJfUBjcAjK16wgV zX13FZV49eDf+4kyDM1CB8wLt8TYpDstdFtXCUX4igF8cBiM/hPB8zI4hHZOHCsYkX2y JUbFHdv7rYf7Az6cjZICyF0tcX8F0VaQ4d2TWcrrZF9GJ/k5F73qTyomGC9eEuTKVs8O Ca19OvBD8pPYAShpc7O1EDAthoSxcsFzrqEqjg3WIOKYvbkUOLrmSM7UdyylDMJiER2D i2e+xau8tfotBYg6eiOZ9i0E3XkP0an9wvbAnAEWr0r1ODOemLY7MqVBiHmU7feXpMyq pYzw== X-Gm-Message-State: AOAM531u6cOTUOHM2neLfJgIskBFv+5zoApAQskF7mQNpGtyOqrqPRCF JPrvZPD0X07IfSbv6P7a4ebvTUWp+taD4iQW X-Google-Smtp-Source: ABdhPJzwsewfz/TZInoLtcuvYaZ0I40Qn7oK2vNyTP6uAYb18yvMtG1+sQlLK+ggxuOgSY+2gruJ4PNGKknNJrtO X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:edb8:b79c:2e20:e531]) (user=andreyknvl job=sendgmr) by 2002:a0c:eda6:: with SMTP id h6mr4862060qvr.19.1612539567383; Fri, 05 Feb 2021 07:39:27 -0800 (PST) Date: Fri, 5 Feb 2021 16:39:05 +0100 In-Reply-To: <cover.1612538932.git.andreyknvl@google.com> Message-Id: <ece9cd2cca38dd3797c6cd1756e30a2e40b0d451.1612538932.git.andreyknvl@google.com> Mime-Version: 1.0 References: <cover.1612538932.git.andreyknvl@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH v2 04/12] kasan: clean up setting free info in kasan_slab_free From: Andrey Konovalov <andreyknvl@google.com> To: Andrew Morton <akpm@linux-foundation.org>, Catalin Marinas <catalin.marinas@arm.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Dmitry Vyukov <dvyukov@google.com>, Alexander Potapenko <glider@google.com>, Marco Elver <elver@google.com> Cc: Will Deacon <will.deacon@arm.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Peter Collingbourne <pcc@google.com>, Evgenii Stepanov <eugenis@google.com>, Branislav Rankov <Branislav.Rankov@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov <andreyknvl@google.com> Content-Type: text/plain; charset="UTF-8" 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: <linux-mm.kvack.org> |
Series |
kasan: optimizations and fixes for HW_TAGS
|
expand
|
diff --git a/mm/kasan/common.c b/mm/kasan/common.c index f2a6bae13053..da24b144d46c 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); }