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=-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, URIBL_BLOCKED,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 1AAF4C2D0E4 for ; Mon, 23 Nov 2020 20:15:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7B7AE20717 for ; Mon, 23 Nov 2020 20:15:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="X8wfvSUP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B7AE20717 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 E70086B0074; Mon, 23 Nov 2020 15:15:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E46C76B0075; Mon, 23 Nov 2020 15:15:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC6B46B0078; Mon, 23 Nov 2020 15:15:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 9E4CD6B0074 for ; Mon, 23 Nov 2020 15:15:02 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 275FF3632 for ; Mon, 23 Nov 2020 20:15:02 +0000 (UTC) X-FDA: 77516786844.21.ants81_05108e027368 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id E4DE7180442C3 for ; Mon, 23 Nov 2020 20:15:01 +0000 (UTC) X-HE-Tag: ants81_05108e027368 X-Filterd-Recvd-Size: 4791 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf07.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Nov 2020 20:15:01 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id v8so13697892qvq.12 for ; Mon, 23 Nov 2020 12:15:01 -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=X0qNbr9WproLcGX2R7jejC4I91Gg1JCilClxf4uOdQ4=; b=X8wfvSUPWDOeubA5laS0MiS+5zHTHlfDCeXD7x++Y29NOmeLLnfbzlFHR4Hb5I2RLu 9wd7W4DbL8t9WKn3i3FFJCexrLUKyqTUwXXHQ430kj8PdXDFnUpSI4xrd3GsfIU/ptme K5x/3lGScHV8LUNjww9qOHEJXgtGUueWlDXazSz1ByCXleTVf1o8CzId6vU/sQOvsLIK qdHzXbL8ZjXUmWsfu1sm/1iqAf842e3xeAL6FiYUl8MBbvK82iAc5qTIJtyBLOIjQMpZ rODbG8A5iOgyQ40ayjPhbqHoBebQeju5HciYk8AeFACmdvRUt57vrv0DQ7E+Gd4Gj2ZU TM7Q== 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=X0qNbr9WproLcGX2R7jejC4I91Gg1JCilClxf4uOdQ4=; b=Pr8Ag8o3KZJh3xJyl/Y8dZ5pRYLO3e3+8Jd+VuhD0FXV6qc/y5aW4YOBXQ4b9elEgl J4tUFPODLkQIsXKUKJjJzkD7wFcoS2usohPQDIvwFuIsR4n/78XiR4gDZF1UFVRWMJVf +gM5+M/Iaqt1StFyMwk3HMvdZePYMNXMQv4EusqdSRBeg+zQWUXu8vdqMp/ol2QOvmmP R4gLc5DzxlMfW/WEEzD00wyqApcNsbqbBiZlljZTcc26neOUz+ppIW8rTif6DuaAL4yi klRlbh9F7mvMMWr1c0eE0XtvuSyI0/6Hw3FlX3j5e9lZa6WrNg2aaWL+s+ECoAVMXBI2 WKvg== X-Gm-Message-State: AOAM531+ONa4Z3pe7L2PDZYl43iA50ckGvHL2VYf9+Iv4dUoi2EFSAN8 KZX9w7t6TEIn0BRu7Qs/pfwjVlgqvgifGIbv X-Google-Smtp-Source: ABdhPJzImvXjbgZa+dqZyuNCYbUOjmgmMgki62vl+7qg8STo88r/i4TsRQg7xr1TST9CH00poNibD1gCn0B4pbPv X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:9a9:: with SMTP id du9mr1102774qvb.47.1606162500502; Mon, 23 Nov 2020 12:15:00 -0800 (PST) Date: Mon, 23 Nov 2020 21:14:33 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v4 03/19] kasan: introduce set_alloc_info From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , 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, Andrey Konovalov 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: 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 Reviewed-by: Dmitry Vyukov Reviewed-by: Marco Elver 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 8197399b0a1f..0a420f1dbc54 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -327,6 +327,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) { @@ -357,7 +362,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.2.454.gaff20da3a2-goog