From patchwork Tue Jul 12 13:39:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Harry (Hyeonggon) Yoo" <42.hyeyoo@gmail.com> X-Patchwork-Id: 12915008 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 4A321C43334 for ; Tue, 12 Jul 2022 13:40:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDC8B94007E; Tue, 12 Jul 2022 09:40:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D8D05940063; Tue, 12 Jul 2022 09:40:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C547394007E; Tue, 12 Jul 2022 09:40:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B7629940063 for ; Tue, 12 Jul 2022 09:40:24 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9663CDE5 for ; Tue, 12 Jul 2022 13:40:24 +0000 (UTC) X-FDA: 79678557168.26.217F375 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf20.hostedemail.com (Postfix) with ESMTP id 4631B1C009D for ; Tue, 12 Jul 2022 13:40:24 +0000 (UTC) Received: by mail-pl1-f174.google.com with SMTP id f11so7285382plr.4 for ; Tue, 12 Jul 2022 06:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hkTIlokXdXZHx70dj4cBcCaT2BPOKJtfpJSDSwc0fHU=; b=gXwpav1cs46JY9auUHpcAwYHPt6lSXcC2SSzBTo4UXju5/zqc9fbvLJYuVlpXdlK+x ILUw3UDcuQM6XR0DYIOaLLq7PiFw1DelSfNhpH8fwrMOMcUZKBsnicw8LHwhwYTZZy9f V9yVjlGvi0UjRoM7uKFypklMHjTy5TGtAM389Mbcd/lY4jpm/sC7Nn4xgO2TvpAzLFDO kGQ2/qx9+4o3tsfwPKUPPFOueOag7i1feT+gRgghI/bdCfLwnHTCpw9HeHb2t//988sg c6NWB4HtEj7qA4n2UDfd8bO5eiuCpQHi/pkHoGQi6pX0nDw24mta8uLyX/kz+rzZnmC+ QGQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hkTIlokXdXZHx70dj4cBcCaT2BPOKJtfpJSDSwc0fHU=; b=XL1U/jbrbklswvKYupLupzZTuAQO3+tsDs62+CjeWcxP6NvHY78gbz9L9CrTSAWk50 V4+QwO+yVkG0Y47gVscj6TQhD0vcoHaO9h2mDCSwSRctGGXJGdAcRN79hYmxfJd2CXl/ YK0ABH4KbXmvMdswHtLxs/yowJ+PeTSed/0IYs48aqMpzrsWk1tWNuAzdFV3Qn9GMnvp LL9ZKY05yu7O1kWoRUTVLhBc1SkSz+1L0OvkFbvzJsHDsunRFoOqtD049m2C31/1VfYL qZw7YIlqNey8gtQsY55TfqqSRyI4d67QIj+mO04R6L5ZJBNkfVMYwlxXF1c2VQjNi6c5 /QDg== X-Gm-Message-State: AJIora+mowYHvvJSrbdJ6Ea89ufOjXMTqmP2pOtYqsrq92m6Lp8gFnA/ DVZnE9FVy/Kvq7vxS87DXYk= X-Google-Smtp-Source: AGRyM1t9qjh7ww8HOoIZEKNFWLT+QYRkxOqJ5JGxw1Mo5b4zwMonNKL/Oyevq1mySzRn8kSkxIFfEg== X-Received: by 2002:a17:90b:3807:b0:1f0:a86:6875 with SMTP id mq7-20020a17090b380700b001f00a866875mr4428239pjb.103.1657633223420; Tue, 12 Jul 2022 06:40:23 -0700 (PDT) Received: from ip-172-31-24-42.ap-northeast-1.compute.internal (ec2-35-75-15-180.ap-northeast-1.compute.amazonaws.com. [35.75.15.180]) by smtp.gmail.com with ESMTPSA id r6-20020aa79886000000b0052ae3bcb807sm1947178pfl.188.2022.07.12.06.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 06:40:22 -0700 (PDT) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Joe Perches , Vasily Averin , Matthew WilCox Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v3 09/15] mm/slab_common: cleanup kmalloc_large() Date: Tue, 12 Jul 2022 13:39:39 +0000 Message-Id: <20220712133946.307181-10-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712133946.307181-1-42.hyeyoo@gmail.com> References: <20220712133946.307181-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657633224; a=rsa-sha256; cv=none; b=sNXF7zmziw/gs+KQMxvuyWMGEFk5T4YDD8NvSjNHMP73fG9iq7wJsrPBSHywG7WRsIGRxq osirJZ8R6honBfrM1PQ6uVc03PqmqCRceqjCIZTenGrIYgpX0IVXfOe1Ls57Cmht7sExW1 UjQNtW+cD6iWAeoPLfUjHQIFoKaWHXE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=gXwpav1c; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657633224; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hkTIlokXdXZHx70dj4cBcCaT2BPOKJtfpJSDSwc0fHU=; b=0FypH8x6IbaRoSzur+807m5lwKsoV2UgN4TWJyhzfdF+aiNTuvp+KA2T2d8GUYs+T37MTB HbDNtBMYahJesPWodT2DoCRN2TmJWJVV9hZCOMniqWGhpFJA6v2a3dxR6/0BiUHrPQNdF+ wiBVDkjSsOV4YWyj/2X3SkoM+tWdX6k= Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=gXwpav1c; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com X-Rspam-User: X-Stat-Signature: kdycaw8fppiumy7a4ric7kadsxk9mgcr X-Rspamd-Queue-Id: 4631B1C009D X-Rspamd-Server: rspam08 X-HE-Tag: 1657633224-59564 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: Now that kmalloc_large() and kmalloc_large_node() do mostly same job, make kmalloc_large() wrapper of __kmalloc_large_node_notrace(). In the meantime, add missing flag fix code in __kmalloc_large_node_notrace(). Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Reviewed-by: Vlastimil Babka --- mm/slab_common.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index dc872e0ef0fc..9c46e2f9589f 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -932,29 +932,6 @@ gfp_t kmalloc_fix_flags(gfp_t flags) * directly to the page allocator. We use __GFP_COMP, because we will need to * know the allocation order to free the pages properly in kfree. */ -void *kmalloc_large(size_t size, gfp_t flags) -{ - void *ret = NULL; - struct page *page; - unsigned int order = get_order(size); - - if (unlikely(flags & GFP_SLAB_BUG_MASK)) - flags = kmalloc_fix_flags(flags); - - flags |= __GFP_COMP; - page = alloc_pages(flags, order); - if (likely(page)) { - ret = page_address(page); - mod_lruvec_page_state(page, NR_SLAB_UNRECLAIMABLE_B, - PAGE_SIZE << order); - } - ret = kasan_kmalloc_large(ret, size, flags); - /* As ret might get tagged, call kmemleak hook after KASAN. */ - kmemleak_alloc(ret, size, 1, flags); - trace_kmalloc(_RET_IP_, ret, NULL, size, PAGE_SIZE << order, flags); - return ret; -} -EXPORT_SYMBOL(kmalloc_large); static __always_inline void *__kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) @@ -963,6 +940,9 @@ void *__kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) void *ptr = NULL; unsigned int order = get_order(size); + if (unlikely(flags & GFP_SLAB_BUG_MASK)) + flags = kmalloc_fix_flags(flags); + flags |= __GFP_COMP; page = alloc_pages_node(node, flags, order); if (page) { @@ -978,6 +958,16 @@ void *__kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) return ptr; } +void *kmalloc_large(size_t size, gfp_t flags) +{ + void *ret = __kmalloc_large_node_notrace(size, flags, NUMA_NO_NODE); + + trace_kmalloc(_RET_IP_, ret, NULL, size, + PAGE_SIZE << get_order(size), flags); + return ret; +} +EXPORT_SYMBOL(kmalloc_large); + void *kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) { return __kmalloc_large_node_notrace(size, flags, node);