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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 42B00C43457 for ; Wed, 14 Oct 2020 20:44:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BBD4122248 for ; Wed, 14 Oct 2020 20:44:54 +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="muFweiHY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BBD4122248 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 38D89940009; Wed, 14 Oct 2020 16:44:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 36B596B0070; Wed, 14 Oct 2020 16:44:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DFC1940009; Wed, 14 Oct 2020 16:44:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0190.hostedemail.com [216.40.44.190]) by kanga.kvack.org (Postfix) with ESMTP id DF3E36B006E for ; Wed, 14 Oct 2020 16:44:53 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 82B3A1EE6 for ; Wed, 14 Oct 2020 20:44:53 +0000 (UTC) X-FDA: 77371710066.18.bag12_5409b052720e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 512031021F70A for ; Wed, 14 Oct 2020 20:44:53 +0000 (UTC) X-HE-Tag: bag12_5409b052720e X-Filterd-Recvd-Size: 4719 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Wed, 14 Oct 2020 20:44:52 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id b11so264667wrm.3 for ; Wed, 14 Oct 2020 13:44:52 -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=7WKioc0F5nnoW2jvJmr0weBuEa6v4Kil5DUIEGSTVOk=; b=muFweiHYXv+gMPyiT7uaX4jvJ8gMYxQNuNVjODMtNI+83vDFZNY3z3Sdo9dkBxqwTv WqASfkRC6TMYpMzpjQYzoQtMEq+VZywMgWgOiqnq9m6RQ+HUYsumU6RHIrwjE3r1JA0j Sxs4ghgEVN7T3SoeK7kekwozXLHlxEQFwCxZOmjk54vCGBxvmNeKovY4ynv8YUNyLV8E UFhCfwVM+rE73rLDZU4u6Y4eHKTDVxfEsnlgRKoROhKzVG46wfNB7AdVuToujWAXZPl0 Eb3guWfpP2vQjirwfaWM/u9aeyuMO7ofVIYP0C6/cRNkvYSe1U58GTGuNXwg8NzpS5YZ rDPQ== 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=7WKioc0F5nnoW2jvJmr0weBuEa6v4Kil5DUIEGSTVOk=; b=YX6N4wwhT2gvsc+ppCOlzDgFsKPi0HUph3a4JZiYQ72/vB3L5dGuDJ+PFQosoWM86H Do5j+AZMgevKYXQlY9boakQDfr+BJI8cnTJWOETZgWYvoKMVVM9qm9N4OCpu4A2YqXYG 5XnT8jiqV3ba6XZ3dsuKhz0foOsv+nndK7w+rB8xvK32AxaKsf0H6241vJgN+1peWfsB p6cT+CaIXbn+V5PEmNEyAReu/iCl2hHaikGyqMnnAqsUrLGlUfR2QGWoRnfq2BiS4yXI +73pzTZBnjSUeNmTQTOUWHWXmM0NTRUcR1pBXivfASq17b+fVuTt1EUCl9n99nNO8iet aMHQ== X-Gm-Message-State: AOAM531egwT5cKn+WFQKC6ZYkv9qzQJJNPA5L0GVCtN3mD1/ujwO3Cah 9nNhFslSOEfiy3wFfBbKh0AvxmgLL5EWV5sp X-Google-Smtp-Source: ABdhPJxhKXKbXhJzKdYszjSgl90zyo0RlvRwLwrE/1dsncswUvyValSoS9m1K6XSomniP88/tEy1KuujP0ZSV800 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:35c7:: with SMTP id c190mr568356wma.7.1602708291670; Wed, 14 Oct 2020 13:44:51 -0700 (PDT) Date: Wed, 14 Oct 2020 22:44:31 +0200 In-Reply-To: Message-Id: <407a7ff9d88cb484870507dbef6c5de833102556.1602708025.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH RFC 3/8] kasan: introduce set_alloc_info From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver , Evgenii Stepanov Cc: 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" 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 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.28.0.1011.ga647a8990f-goog