From patchwork Wed Oct 14 20:44:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11838261 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 21A081580 for ; Wed, 14 Oct 2020 20:44:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C74032224E for ; Wed, 14 Oct 2020 20:44:49 +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="EBGrD6RN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C74032224E 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 ADFA9940007; Wed, 14 Oct 2020 16:44:48 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A919E6B0068; Wed, 14 Oct 2020 16:44:48 -0400 (EDT) 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 9A734940007; Wed, 14 Oct 2020 16:44:48 -0400 (EDT) X-Original-To: linux-mm@kvack.org 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 68A0A6B0062 for ; Wed, 14 Oct 2020 16:44:48 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 11B31348D for ; Wed, 14 Oct 2020 20:44:48 +0000 (UTC) X-FDA: 77371709856.26.cable64_5205cd82720e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id DD5DC1804B668 for ; Wed, 14 Oct 2020 20:44:47 +0000 (UTC) X-Spam-Summary: 1,0,0,42b073339fecbf4a,d41d8cd98f00b204,3pmohxwokccuboesfzlowmhpphmf.dpnmjovy-nnlwbdl.psh@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:6120:6261:6653:7901:8660:9025:9969:10004:10400:11026:11473:11658:11914:12043:12048: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.160.202:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04y8twj4wz7do8qb116nh6h7gsg3jycgay3kykw65dzask68dpttpyfneuucs75.tkdrs9qjzpzez4hxu4qr4bu6h7n6kcgxkddsfx1aerh7qurd 6jzagduz X-HE-Tag: cable64_5205cd82720e X-Filterd-Recvd-Size: 5769 Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Wed, 14 Oct 2020 20:44:47 +0000 (UTC) Received: by mail-qt1-f202.google.com with SMTP id 7so506676qtp.18 for ; Wed, 14 Oct 2020 13:44:47 -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=CjGwVkjALHWoxnEpXUV5lg0pURyX1Lwjm/IxKYecvEk=; b=EBGrD6RN6xliNU79AWfmLo4aIDWh5aG3DjFXT7Waz6MK39WO/qU2QVR37uIkOel0tB cN48b+GW2inj2ip2t4+zE3AIkYKWxMgEHGr3qGt+grT8H8/Y2EWjYQxWAD2oXhQCFmNh PlYeiBPPS9e0yVQHBR9HqgahZtloF9KNLBICgjCL1pkgbhhwwmF+xwiZg27iJbeeEFYa yfq/yPLL003ZMrPNucEYvSiLFxctu0jqT7e9juN8tPhII9usBsXGfhzX/nvEp5dgmuf9 5DreMenxc/NfqbdxjxRzGYuXFlLPlKcp9EjLKimG4q8Y2miP/H4LaWSNJS1LM4kyEwqu 7ZHg== 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=CjGwVkjALHWoxnEpXUV5lg0pURyX1Lwjm/IxKYecvEk=; b=fMvmQ5ofDLM7dDzhLExk+ZUlSmGt2dZkUtI7UxBcgUsfFBQJMnjKCvyIvEDMu75mwy 3r1XpuuBxWfSIQSdFRAq33gWkrKe+dB93NQzYawSdUGiYKRLlcRxcbCZd8zJI0P3EiFL Yk024eWrhIJh6XbR2dUMTOLhrY4Jo35Z2GzGfKChLArd6cVKBVuxYlL268U+/Akuo61a FDMdRqRefEeO+honwAkJAH2p1WkfCjyRwBmlyl9Qc8ikBKm2ukXiaXTKC51ESMZVZYHp GWx1QfaFIJ8R5ZIoCd2JyzH6Gwh6oAB18ofMGGrYqNXclAXBx32NeBVXoF8CZwjXwdkJ Excg== X-Gm-Message-State: AOAM532VO8ULxnEt/kr2YyWL9JFnHKlUBXoSj8FChXyXYjt2NRgvGxPq e9Cu5zR8ryiBIW9Q+9U4wZ06nTxdNRGd1aKi X-Google-Smtp-Source: ABdhPJyPS70k0bCBzAHZh7jQMEEFG1g2Nv/DzdUR14lOKVf0hYkMYkuYAvdtNuFtwtJnHpBjo+xyl45FSh1Jk4UO X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:5547:: with SMTP id v7mr1394100qvy.9.1602708286682; Wed, 14 Oct 2020 13:44:46 -0700 (PDT) Date: Wed, 14 Oct 2020 22:44:29 +0200 In-Reply-To: Message-Id: <42f809a3f36e9ca5b62e6a5b13c90e664d6e2933.1602708025.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH RFC 1/8] kasan: simplify quarantine_put call 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 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 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 2bb0ef6da6bd..5712c66c11c1 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -308,7 +308,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 32ddb18541e3..a3bf60ceb5e1 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -214,12 +214,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