From patchwork Fri Nov 13 22:19:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11904951 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EEF18697 for ; Fri, 13 Nov 2020 22:20:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A9CC0206F9 for ; Fri, 13 Nov 2020 22:20:20 +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="sv8Z/Kpl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9CC0206F9 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 C51836B0068; Fri, 13 Nov 2020 17:20:19 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C010F6B006C; Fri, 13 Nov 2020 17:20:19 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B172B6B006E; Fri, 13 Nov 2020 17:20:19 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0140.hostedemail.com [216.40.44.140]) by kanga.kvack.org (Postfix) with ESMTP id 842F66B0068 for ; Fri, 13 Nov 2020 17:20:19 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 3928D181AEF07 for ; Fri, 13 Nov 2020 22:20:19 +0000 (UTC) X-FDA: 77480814558.15.way70_1a0cd1527312 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 1150E1814B0C7 for ; Fri, 13 Nov 2020 22:20:19 +0000 (UTC) X-Spam-Summary: 1,0,0,8e4ad7a57e634523,d41d8cd98f00b204,3oqavxwokcg4mzpdqkwzhxsaasxq.oayxuzgj-yywhmow.ads@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:967:968:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:1981:2194:2196:2199:2200:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3353:3865:3867:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:4425:4605:5007:6261:6653:6742:7901:8660:9025:9969:10004:10400:11026:11473:11658:11914:12043:12296:12297:12438:12555:12679:12895:12986:13148:13230:14096:14097:14181:14394:14659:14721:21080:21212:21365:21444:21451:21627:21939:21966:21990:30054:30075,0,RBL:209.85.221.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yrhykkj7eh4f3s9eucffktnai9yypfut7xejzkudzask68dpp6b4zjcburbw1.bn6owbqjzpzez4hxu4qr4bu6h7n6kcgxkddsfx1aerh7qurd6jzagdu zicsapmn X-HE-Tag: way70_1a0cd1527312 X-Filterd-Recvd-Size: 5834 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Fri, 13 Nov 2020 22:20:18 +0000 (UTC) Received: by mail-wr1-f73.google.com with SMTP id l5so4659800wrn.18 for ; Fri, 13 Nov 2020 14:20:18 -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=yJWxegPyzZmdx3tmzwd/mzW6YwRRuhTO52iQtSKYSdE=; b=sv8Z/Kpl8DPqS1Sq+9LSV8BzlnIXBEtlOFEuhbGnHPOXO55RZ0oPEEP5JKnN7fT+Ak fKVXOWxiDqG1juvq/4nEvVop/KyMwRKCDawX2Wcfc9QLjTsbEjqvJ47W3sld96b2x+Ku u4CNde58Ko+XriUl+s1iPD2ydInydYVLqXLRBCG2enfSsNWyw21fJAJrOdEDsYO2Z8HX hR3X4h0AllRSuOJUSwRLDw1SY8aOm1MsvLgNxcz27AOTj51eguTLz0FmMKiIK5CCEf+t gYZjbtRgH58KjocgQo0Ok1aEKIWTwfTFJND37dE2bp/Fxk5hMPsf96NpO4P7Pkn2t4Xo V2zw== 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=yJWxegPyzZmdx3tmzwd/mzW6YwRRuhTO52iQtSKYSdE=; b=aj5NWX2y8BRLpxyIVubsy1v+6R3SIxdsmfNF9r2h7JvQSPIOT5FrTsLIOw+5aGHx87 52a6TjjnQnDsodFZJleEwNJ8hcpHAJ3vSRBFXoMjENlel5II81S7fuK1+lwMy70oZMcf wjpX5lIjFPSB2lYAKmZxcujbcbfC47h6a7b2GKhbf/i2vQYbOheIoiV6Eqo2mO7v8gmZ z/NUgBIu5rAK7zhopUOK6uhI1RZQ3pq+xwnVUpBQP0ZdqDAifu/WiT36PgB71jvNE3D9 DvuE4qeRLvwuSoB3c+ZgrKZ4Ydo78CBJ/Ot6sT9/joJNiDFoBKJjYQOu/CKAP+RNNwkH QoRw== X-Gm-Message-State: AOAM531K5OdPXoT5m5IN0QbXjV36q4iyKwBrZJq0lZAyeyPTFQmosG46 pW1h/2UMKuIEgcpO5DGshfstSaXmf+6P6CzI X-Google-Smtp-Source: ABdhPJztvZOjYQgEdQq2vWkh9fZERHuoYj0nV+zcLr3AnX/+IEHgi9Qpjls1gxC875+5jFe6XwSJ/NKXDEkUQdd4 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:658b:: with SMTP id z133mr4378653wmb.1.1605306017372; Fri, 13 Nov 2020 14:20:17 -0800 (PST) Date: Fri, 13 Nov 2020 23:19:51 +0100 In-Reply-To: Message-Id: <0eeeec8ecbf877e526ea43808e40e9062550217b.1605305978.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v3 01/19] kasan: simplify quarantine_put call site 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 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: Move get_free_info() call into quarantine_put() to simplify the call site. No functional changes. Signed-off-by: Andrey Konovalov Reviewed-by: Dmitry Vyukov Reviewed-by: Marco Elver Link: https://linux-review.googlesource.com/id/Iab0f04e7ebf8d83247024b7190c67c3c34c7940f --- mm/kasan/common.c | 2 +- mm/kasan/kasan.h | 5 ++--- mm/kasan/quarantine.c | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 998aede4d172..e11fac2ee30c 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -317,7 +317,7 @@ static bool __kasan_slab_free(struct kmem_cache *cache, void *object, kasan_set_free_info(cache, object, tag); - quarantine_put(get_free_info(cache, object), cache); + quarantine_put(cache, object); return IS_ENABLED(CONFIG_KASAN_GENERIC); } diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 64560cc71191..13c511e85d5f 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -216,12 +216,11 @@ struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, #if defined(CONFIG_KASAN_GENERIC) && \ (defined(CONFIG_SLAB) || defined(CONFIG_SLUB)) -void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache); +void quarantine_put(struct kmem_cache *cache, void *object); void quarantine_reduce(void); void quarantine_remove_cache(struct kmem_cache *cache); #else -static inline void quarantine_put(struct kasan_free_meta *info, - struct kmem_cache *cache) { } +static inline void quarantine_put(struct kmem_cache *cache, void *object) { } static inline void quarantine_reduce(void) { } static inline void quarantine_remove_cache(struct kmem_cache *cache) { } #endif diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c index 580ff5610fc1..a0792f0d6d0f 100644 --- a/mm/kasan/quarantine.c +++ b/mm/kasan/quarantine.c @@ -161,11 +161,12 @@ static void qlist_free_all(struct qlist_head *q, struct kmem_cache *cache) qlist_init(q); } -void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache) +void quarantine_put(struct kmem_cache *cache, void *object) { unsigned long flags; struct qlist_head *q; struct qlist_head temp = QLIST_INIT; + struct kasan_free_meta *info = get_free_info(cache, object); /* * Note: irq must be disabled until after we move the batch to the