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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 329C7C433EF for ; Tue, 7 Jun 2022 12:54:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B4098D000A; Tue, 7 Jun 2022 08:54:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 963678D0003; Tue, 7 Jun 2022 08:54:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82A4C8D000A; Tue, 7 Jun 2022 08:54:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 712888D0003 for ; Tue, 7 Jun 2022 08:54:06 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 48C0312079F for ; Tue, 7 Jun 2022 12:54:06 +0000 (UTC) X-FDA: 79551432492.27.9AB61F6 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by imf12.hostedemail.com (Postfix) with ESMTP id C6C8D40038 for ; Tue, 7 Jun 2022 12:53:18 +0000 (UTC) Received: by mail-ej1-f41.google.com with SMTP id h23so23930530ejj.12 for ; Tue, 07 Jun 2022 05:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7NOMlCyOOzxhbCbuwq3ZJ0vTGpi3XnqAoh4xLB3lmQU=; b=kO99fIKDL7qtIqBbuxvxvhMhbQfe59GBQb1vhmNeL0sEIa99mujKCOsr9wfhhngxXv OwjoGk/cCLVGGGPWCNUqHoWNBrhfExW6eb/6ixYRX82RWuCvN8/aeqZpjw/aKMJLfBG8 /LNoym75s/DLbaBpkLawwx0ocrnQjQjjdfrdSHH14TaPRLCq8f8kCvfwWweQjycRwZ5h R+IimHKKAXKXvpJUo0F7a7MyWaB/SmS+MxherhonEQ0ODXyZWSXTTQBxPZ4dK1plHcBO vlkhd3/x5qVaAIu5/Ch6v9vKGffn2DSpz0z2WkSKNtPpgeJ5olRYkhxINBsO3vBBiV4q Vv/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7NOMlCyOOzxhbCbuwq3ZJ0vTGpi3XnqAoh4xLB3lmQU=; b=1Og2M/mGP5pL7hPSQPrnOotWP/QfSTcaxHzNnVeQk3EuTU5khUbqatWzFihzn+sQL6 +6juLjb17Ujtu+0WROK7vZPi1KEzm4pQtwXNb2a9hUNu7PKQ+XRlCS/vi0XKiUWvJTk0 mqFO2U8GRXNACAXeL+OouaIOFIOTJMvEucp4tU0xJDkpqIPmn778n19DXuwq5Vak/w53 EK3V9zX1ZCUTQxLHtRRiJay/TPZ16y3DIO11Kz2YzLeSR5A5WUTRCBg5bc0PFsLTLny4 lwoq8NL3ihKOoZkt2/JR6RrF8/bfDuEa3SjdLWJt+5Rk831UxHbTXMQte6I9iNy4ijNc wVNw== X-Gm-Message-State: AOAM5300i3BNoDjENA620g1PipA3MzqaPFH3c48NXJ791B6yQaltNbXN WYMjpTaCY6aXvj8BBiT5SOfI2GXXUcBFrU9fpSU= X-Google-Smtp-Source: ABdhPJxQN01lGZphXqLlwP/JB31yWjBQPvrSqFT6IzA0+0422NzSBqsqEmeaZGhOtCNCUoWk4FLXTBxtPL+uUtKCw6I= X-Received: by 2002:a17:906:74b:b0:710:e677:1383 with SMTP id z11-20020a170906074b00b00710e6771383mr15248400ejb.444.1654606444227; Tue, 07 Jun 2022 05:54:04 -0700 (PDT) MIME-Version: 1.0 References: <20220607105958.382076-1-bhe@redhat.com> <20220607105958.382076-2-bhe@redhat.com> In-Reply-To: <20220607105958.382076-2-bhe@redhat.com> From: Uladzislau Rezki Date: Tue, 7 Jun 2022 14:53:52 +0200 Message-ID: Subject: Re: [PATCH v2 1/4] mm/vmalloc: invoke classify_va_fit_type() in adjust_va_to_fit_type() To: Baoquan He Cc: Andrew Morton , Linux Memory Management List , LKML , Christoph Hellwig Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: C6C8D40038 Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=kO99fIKD; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf12.hostedemail.com: domain of urezki@gmail.com designates 209.85.218.41 as permitted sender) smtp.mailfrom=urezki@gmail.com X-Stat-Signature: rbmgu6zoxyy4ck4kre1m57t1juijzkf3 X-Rspam-User: X-HE-Tag: 1654606398-703688 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: > > In function adjust_va_to_fit_type(), it checks all values of passed > in fit type, including NOTHING_FIT in the else branch. However, the > check of NOTHING_FIT has been done inside adjust_va_to_fit_type() and > before it's called in all call sites. > > In fact, both of these two functions are coupled tightly, since > classify_va_fit_type() is doing the preparation work for > adjust_va_to_fit_type(). So putting invocation of classify_va_fit_type() > inside adjust_va_to_fit_type() can simplify code logic and the redundant > check of NOTHING_FIT issue will go away. > > Suggested-by: Uladzislau Rezki (Sony) > Signed-off-by: Baoquan He > --- > mm/vmalloc.c | 23 ++++++----------------- > 1 file changed, 6 insertions(+), 17 deletions(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 07db42455dd4..f9d45aa90b7c 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -1335,10 +1335,10 @@ classify_va_fit_type(struct vmap_area *va, > > static __always_inline int > adjust_va_to_fit_type(struct vmap_area *va, > - unsigned long nva_start_addr, unsigned long size, > - enum fit_type type) > + unsigned long nva_start_addr, unsigned long size) > { > struct vmap_area *lva = NULL; > + enum fit_type type = classify_va_fit_type(va, nva_start_addr, size); > > if (type == FL_FIT_TYPE) { > /* > @@ -1444,7 +1444,6 @@ __alloc_vmap_area(unsigned long size, unsigned long align, > bool adjust_search_size = true; > unsigned long nva_start_addr; > struct vmap_area *va; > - enum fit_type type; > int ret; > > /* > @@ -1472,14 +1471,9 @@ __alloc_vmap_area(unsigned long size, unsigned long align, > if (nva_start_addr + size > vend) > return vend; > > - /* Classify what we have found. */ > - type = classify_va_fit_type(va, nva_start_addr, size); > - if (WARN_ON_ONCE(type == NOTHING_FIT)) > - return vend; > - > /* Update the free vmap_area. */ > - ret = adjust_va_to_fit_type(va, nva_start_addr, size, type); > - if (ret) > + ret = adjust_va_to_fit_type(va, nva_start_addr, size); > + if (WARN_ON_ONCE(ret)) > return vend; > > #if DEBUG_AUGMENT_LOWEST_MATCH_CHECK > @@ -3735,7 +3729,6 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, > int area, area2, last_area, term_area; > unsigned long base, start, size, end, last_end, orig_start, orig_end; > bool purged = false; > - enum fit_type type; > > /* verify parameters and allocate data structures */ > BUG_ON(offset_in_page(align) || !is_power_of_2(align)); > @@ -3846,15 +3839,11 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, > /* It is a BUG(), but trigger recovery instead. */ > goto recovery; > > - type = classify_va_fit_type(va, start, size); > - if (WARN_ON_ONCE(type == NOTHING_FIT)) > + ret = adjust_va_to_fit_type(va, start, size); > + if (WARN_ON_ONCE(unlikely(ret))) > /* It is a BUG(), but trigger recovery instead. */ > goto recovery; > > - ret = adjust_va_to_fit_type(va, start, size, type); > - if (unlikely(ret)) > - goto recovery; > - > /* Allocated area. */ > va = vas[area]; > va->va_start = start; > -- > 2.34.1 > Reviewed-by: Uladzislau Rezki (Sony) -- Uladzislau Rezki