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=-20.4 required=3.0 tests=BAYES_00,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, URIBL_BLOCKED,USER_AGENT_GIT,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 E6512C388F7 for ; Thu, 22 Oct 2020 13:19:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8BAF1222E9 for ; Thu, 22 Oct 2020 13:19:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="s9oM5iH8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2899525AbgJVNTh (ORCPT ); Thu, 22 Oct 2020 09:19:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2899491AbgJVNTd (ORCPT ); Thu, 22 Oct 2020 09:19:33 -0400 Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54585C0613CF for ; Thu, 22 Oct 2020 06:19:33 -0700 (PDT) Received: by mail-wm1-x34a.google.com with SMTP id l23so346718wmg.6 for ; Thu, 22 Oct 2020 06:19:33 -0700 (PDT) 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=5q3U4VLFNuW4Say/+COEa9cSd+BCTb/gfYzQFqbrIt4=; b=s9oM5iH8DyztpJ3yei2iELfje52kmUcHTd8eyzbMwAQSbqFtWHjatQDduusnEXcBlF dRcEZe7WUb2zjkKKb+HrmDJii0fH3LewAeHtE4bfLxfxNB0awQTKOED3tKnrbtywAlmZ RJsxxpdAFtW5V3dmIz/CVR+19BKDULMG6qzSLXojtBknlRQx9kN4tTCncVdHJPA8VUw+ ntbNj4QyHwsTBqXjJyzC4GHrQpK32UiA4tB+hd9+MQf5vqF/urDWATHcyIIPeqmLx/5g KDMHT07LfkP+rVyJQx5//13B01/a4uwGjMKhjHmZSq1H44/nxYNmf/RuVz3Hw+mGHk0B ozkg== 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=5q3U4VLFNuW4Say/+COEa9cSd+BCTb/gfYzQFqbrIt4=; b=t3zkCZgRelubaPfKR8n5raUp9M5PK56XEj/8wtjtTvfatRFko+3nTTUfCxUWaK8ipo ufQo7kUOiQW1/EjzsdgyutHRQ9fFePb0yeMHOYW1jcMSIXXwYvstI7SFsexc2MlI0bSE GmiACWUn+DO0y3y9VR080vVHLIUvCugp1PMYmkeMIV5nvdrij9J2FiyzSFQ9V0aY9q0H 3s6RoeGh4atfiwaRMOaNX0BFU+liWcDM0T0PiZiIpRv4bBbPEmTUrzJyZXGd9nfJglKF lGnEKGioKWARnNiPXtmZI5q/cwaGdt4B/mETVLBpWOwLCCRJKSZKOdWKxsstvUs/8uS/ R9dw== X-Gm-Message-State: AOAM530l94PctdemVkfucctgP1/HpREAehqPYh6gIiRdDjbdP6L9nWiO tBTMbypyV5B0zSyx7+4O63eXXC56PhSOaQKC X-Google-Smtp-Source: ABdhPJz4Ufp39mZeum3PfjjYho0JpryDj6izuaC9cJUX07BIT7hBs0Dfy/fZBFj7FE4zj5eQxQAoPX94JecMHeSF Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a5d:4fcc:: with SMTP id h12mr2880700wrw.132.1603372772026; Thu, 22 Oct 2020 06:19:32 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:55 +0200 In-Reply-To: Message-Id: <595f9936a80b62ab89b884d71e904eaa884a96c2.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 03/21] kasan: introduce set_alloc_info From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add set_alloc_info() helper and move kasan_set_track() into it. This will simplify the code for one of the upcoming changes. No functional changes. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I0316193cbb4ecc9b87b7c2eee0dd79f8ec908c1a --- mm/kasan/common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 8fd04415d8f4..a880e5a547ed 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -318,6 +318,11 @@ bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) return __kasan_slab_free(cache, object, ip, true); } +static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) +{ + kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); +} + static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, size_t size, gfp_t flags, bool keep_tag) { @@ -345,7 +350,7 @@ static void *__kasan_kmalloc(struct kmem_cache *cache, const void *object, KASAN_KMALLOC_REDZONE); if (cache->flags & SLAB_KASAN) - kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); + set_alloc_info(cache, (void *)object, flags); return set_tag(object, tag); } -- 2.29.0.rc1.297.gfa9743e501-goog