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 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 2CC20C55179 for ; Thu, 22 Oct 2020 13:19:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 92253221FE for ; Thu, 22 Oct 2020 13:19:36 +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="s9oM5iH8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 92253221FE 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 13B4F6B007B; Thu, 22 Oct 2020 09:19:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0EB296B007D; Thu, 22 Oct 2020 09:19:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0027D6B007E; Thu, 22 Oct 2020 09:19:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C31E56B007B for ; Thu, 22 Oct 2020 09:19:35 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 5F0B7181AEF07 for ; Thu, 22 Oct 2020 13:19:35 +0000 (UTC) X-FDA: 77399618310.10.mouth19_400f8bb27251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 9B6AF16A4BC for ; Thu, 22 Oct 2020 13:19:33 +0000 (UTC) X-HE-Tag: mouth19_400f8bb27251 X-Filterd-Recvd-Size: 4853 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:33 +0000 (UTC) Received: by mail-wm1-f74.google.com with SMTP id y13so346092wmj.7 for ; Thu, 22 Oct 2020 06:19:32 -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=K8H3rM6NW/iaO1LUB4C/4goWlmWKURcvSZgsvLWmQ3wdpF8PxGUDQagl8d/uwWjpKe xhN8O/Ngu6nKuHTIWfxj8utT8qjjMy69fsQtXN/UtegUFrI1hu409grNsY5CIj+Sd3SE iSiBrNKVs37IE3+OwIflh+hizYzke7eSzzX9yVas20syKoVW1iO+RTTz5M31i8oW5Z+f 3fpA367COJcAC/l5JUxKi7OUXCK7FP5fuEHVexyVuvjIRJosWKrkRkEAG1Et0Wjzv3sG n2Gx1YoXznCxuAwIdjlcUHEs8SfUzBd4q9ZkawsrN2ZiLKJgeR8CBHxIjwva/crvS/Ij dd3Q== X-Gm-Message-State: AOAM530Ycr+ZSBcSSsxY5Nuze8ptVHg6XovLRXbZRBE7bj8/NXHZGJiy 8G7UKw2JsI07TRY3AgY7prsMfs789h7w6QG6 X-Google-Smtp-Source: ABdhPJz4Ufp39mZeum3PfjjYho0JpryDj6izuaC9cJUX07BIT7hBs0Dfy/fZBFj7FE4zj5eQxQAoPX94JecMHeSF 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" 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.29.0.rc1.297.gfa9743e501-goog 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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 72D62C388F2 for ; Thu, 22 Oct 2020 13:21:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EFFD624178 for ; Thu, 22 Oct 2020 13:21:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="A+SsAQ7F"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="s9oM5iH8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFFD624178 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IXwSpHd4W2Vm1xW9QE4aDVqZxAsB4VGy2aelA+fKSJs=; b=A+SsAQ7FDgvpgB4plgDGVbvJX hvIsYmDw47BiEMzsla8+OsXRT9OTshwtNzkhmJBptFnWjiQ10C7Lixi+RixeTbxdIl9uD+PzHOkVS RmFAv2auhgG8j12W8gPmw02VHoVrvwZq/85rOa0h0cs4BkSPsreI5+t33yD9yYl7VlueW7zIz+dc8 AV9mYz5Ix+CniibX8Fw4E3nDsyDUEAJgpfPbru2ux6y33sgD6AmO7M3pzxX5OSCVrHYEbd4IPHtWw 7sgMimk18jLJXeVj3XQwlBByw/Hjhb1CTVAMFBNeeIi4EPwQ6J5Asd1lpHtP0+UzR1y++g8yOvGtr +l9pTfXBQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVaVk-0003s3-2v; Thu, 22 Oct 2020 13:20:08 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVaVD-0003ee-MI for linux-arm-kernel@lists.infradead.org; Thu, 22 Oct 2020 13:19:38 +0000 Received: by mail-wr1-x44a.google.com with SMTP id t17so615407wrm.13 for ; Thu, 22 Oct 2020 06:19:32 -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=Jle/jKAzt1Cj3kG/x0x04gGBK3oSHKv5YEWUrKLmX075R6s6CnvcimXc39/uYQgsCU QhHrIzsQew/9nv7yNTjpsp4MNf5B5UBK+LgSzRrVURNB6PYuNVwbLC8aG3pn5HwqUaJR wrtGDCjdxcm7dMWSCIIqRDWq/tCUtV8IbL21CiQ+uoB758UG1K6gOUeXKMoxypDAZk5R UIK2hvFDL+u5eIzkgXOJbo1thF15xLIJoLyq1ybJXExf/9jwfdzSDINTQTMLvnN4HosF 513N9QfLQrHaDkjJauCL1Z8TMKcVmJ7R2nmksYdEJVcpKiLYM3cuV15HO6cc77898koJ dnRg== X-Gm-Message-State: AOAM5314QUKn2O4UspExkVPMeM8grqLDRsjoSOTJ677n+Y7gQlqBaRQZ dPeSDiDvacxVELD+IRGrZxcm5cuxUH+sB2fh X-Google-Smtp-Source: ABdhPJz4Ufp39mZeum3PfjjYho0JpryDj6izuaC9cJUX07BIT7hBs0Dfy/fZBFj7FE4zj5eQxQAoPX94JecMHeSF 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201022_091935_854486_34B1B2EF X-CRM114-Status: GOOD ( 12.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Branislav Rankov , Elena Petrova , linux-mm@kvack.org, Andrey Konovalov , Kevin Brodsky , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Kostya Serebryany , linux-arm-kernel@lists.infradead.org, Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Peter Collingbourne , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel