From patchwork Fri Mar 31 09:58:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 77714 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp454800vqo; Fri, 31 Mar 2023 03:19:43 -0700 (PDT) X-Google-Smtp-Source: AKy350aMTYwUm8WS0h5bJi9JSGBLTLxhoCZK8R0WMVPyBNnRjs3k7CrvdkInEnFTZzpoobqemI6P X-Received: by 2002:a17:90b:4c49:b0:23b:4bf6:bbfa with SMTP id np9-20020a17090b4c4900b0023b4bf6bbfamr31060239pjb.11.1680257983239; Fri, 31 Mar 2023 03:19:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680257983; cv=none; d=google.com; s=arc-20160816; b=0PdGx2zRHF7BiiDsB757V+0W7QpYyPKGonQnR2n1SGC/BNflpSE67+O7yQW/y+X/CV vxAOzFH37mHq6yd/HJhdzMJgtdE3vh2AaEryQcOdTk722f/tTRSnX1cRQ/O5tgBcFMil Wz1Su5aQ13DbkE7G7dkDsC43WchVFzze+3ZyksORcUdHdNy1F4ERgstQtB8BOa0bHQUJ miiU6qe5QXxla944rpgSBUxlxLMEyA8QUvqKQLz8fF7mo41a0vxgxUpjDHbmpJzRcDeA ZenG8RADibvLE6rMajgWcT1ICNu7p66H+51CwG0uRsCouNNsjqAxBybKyhyNuv+4G3Pi 33Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=V3Imsv5UXjIU6+jF5fHueU/SbtIe7EZ54LbcEh0yngg=; b=e3CBz0Fi4upAnpJadAbDMbECLUft4C+nwBa6HHDA2JXuZ7LCSqCNGeyIQVb30bDOLl AzrxZQ21nZcsG7ei/oCyXfSQVQ2M4IfwxktxZwAfe9uQCtlI3svrFcMt3owA4CXWRljK /KoNZR+GRpF59u5o539ICI0vXg5kjZpdMRQ3anMh6sTB3QG3oOL/GQi5sT0sEsWdWbeZ +nWupAj6sQZUZpMqfW1G3+NeE4L7MsRDTE8qdfFyF+9WcLL4BrHcy9BQuk3mV4q4xAKF XSJlsrdiHra8hvDVQ75R4kqoF0nz4u/P3AAlzRM3DsIG6N8cwamqLw2xkzunwsd6cYDZ NEcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=eNFqrrDv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lk16-20020a17090b33d000b0023ff7fa0970si4412193pjb.169.2023.03.31.03.19.30; Fri, 31 Mar 2023 03:19:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=eNFqrrDv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232046AbjCaKFz (ORCPT + 99 others); Fri, 31 Mar 2023 06:05:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230463AbjCaKFM (ORCPT ); Fri, 31 Mar 2023 06:05:12 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64C912C335 for ; Fri, 31 Mar 2023 02:59:41 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id ja10so20766932plb.5 for ; Fri, 31 Mar 2023 02:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1680256746; x=1682848746; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=V3Imsv5UXjIU6+jF5fHueU/SbtIe7EZ54LbcEh0yngg=; b=eNFqrrDvToe7K30uj4UJdlWR29i2x/3BZZ8yfzzbmfaNxY2ly4sLki8zpCNb1tZL8F 99yx1GqbvY+SYJq73zokyHO5yYeHmQJnsTNl0v83o99fAHuJVEQ3iu2Ib16n74m+GBc6 KsAfwyAiBRByPWGUGz3IRg5l0F2ly8Lt9XpJTZa82a9YVQ2YPetXTMGz0Qeub1rUNOGq 74U77/tjinuH4nZi8bz3ljpHvUvL6IyDLCusE4TSbGa1lAuOTOJGObcYtPfUSr5/0dr9 I6hoGTcoXl3etTMWvHtCYFopuFOlpdoY+jFPcvbTuHhYFNSPp/ax5X/xyzQpFYZJgU8p 5rhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680256746; x=1682848746; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=V3Imsv5UXjIU6+jF5fHueU/SbtIe7EZ54LbcEh0yngg=; b=MrSRfvKtNoxt7yrPhnKgdoEIm0htRMhudAlbi8V/Q76nziFaR+sC5efPdNPyWrqQmy LzWpYhz3eqkfswioMiRbQUQwRvy8ZGFlRzDN1cW3a53qEQBHUPsqUVqYAxlcqnV+BuFc oZA7Qy7P3zyayV9IyCUJYH1nTfZZ2UIlknZOoDGlh+KitgGegJLN94lWvMh0ByXF3Mq0 rAzebXNt4Agrwji0SwX970YQXU5JOcwh0Y+BlZPWE7KKJP/vhKCHS2Re73yO948wXafn VRmwpQGOD+eg0rDoKtwXt3+4ODv0+6R0xZAyLKU0kSfBdmM71Ayhtr60LS/6QTrqyVyx OEPA== X-Gm-Message-State: AAQBX9dLqEDZjmgcA22/1VYiCPdKiHINA8yxp9RWvTcVlGoURQvBSF0S Q4hmcm31WRBX4I9vtaVYMeD7qcvBME9BcOPDcKo= X-Received: by 2002:a17:902:7593:b0:1a2:8871:b430 with SMTP id j19-20020a170902759300b001a28871b430mr5594577pll.2.1680256746575; Fri, 31 Mar 2023 02:59:06 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.229]) by smtp.gmail.com with ESMTPSA id oo5-20020a17090b1c8500b0023b3179f0fcsm4687782pjb.6.2023.03.31.02.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 02:59:06 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, willy@infradead.org, lstoakes@gmail.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH 1/2] mm: swap: use folio_batch_reinit() in folio_batch_move_lru() Date: Fri, 31 Mar 2023 17:58:57 +0800 Message-Id: <20230331095858.51810-1-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761878194848975812?= X-GMAIL-MSGID: =?utf-8?q?1761878194848975812?= In folio_batch_move_lru(), the folio_batch is not freshly initialised, so it should call folio_batch_reinit() as pagevec_lru_move_fn() did before. Signed-off-by: Qi Zheng --- mm/swap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swap.c b/mm/swap.c index 57cb01b042f6..423199ee8478 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -222,7 +222,7 @@ static void folio_batch_move_lru(struct folio_batch *fbatch, move_fn_t move_fn) if (lruvec) unlock_page_lruvec_irqrestore(lruvec, flags); folios_put(fbatch->folios, folio_batch_count(fbatch)); - folio_batch_init(fbatch); + folio_batch_reinit(fbatch); } static void folio_batch_add_and_move(struct folio_batch *fbatch, From patchwork Fri Mar 31 09:58:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 77715 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp455105vqo; Fri, 31 Mar 2023 03:20:20 -0700 (PDT) X-Google-Smtp-Source: AKy350Y2qp35Vnw2tQb4bCcqlopVKCMfMORKt3GIFqd6PHSkR6M90Z5mRZx8/+hw8Okaiym9qqYf X-Received: by 2002:a62:1b85:0:b0:62a:4fbd:60fe with SMTP id b127-20020a621b85000000b0062a4fbd60femr23083609pfb.12.1680258019885; Fri, 31 Mar 2023 03:20:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680258019; cv=none; d=google.com; s=arc-20160816; b=aHl7N1JMyrb9kSr9yKSCY8OEs2PDn04AXr0jPUImWAyhJ3rgVmafo6FTBYmKQlO6Gq 2kOPI9W/R+CZG/sbZHrgf3d7w47IRQtGEMBgvScz3c1AmTdLgX7q6P+4zD/CGW90sC15 JxXeik9dZPqJpU9QEwmoEPFZW4qps3v8+gL0bc9b/SSlHH3u0uUtdXAVWF7+gVBDUzZt cfcOQlYWRdjLNxMipCQScPMLLelw3debtpzs738WXXgBSaPCxHrLFI7H4PWbtAFm1HmN xu8BeX2ctZewSsgfbxVJADeH2BygBabB5FO5c0N67drlO0JosYzZJHk5HgWD8ymzNkL1 VGjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hIf6WOekKcX5cYk5n6UfHyTuwolCuQ5aOTxYYMf+HPA=; b=YxmrJjFFXiCTX2/HG0R5IvxmNgSbuVGX0Yx474YsHiehyksyLmpY7vjkWA+nJFZWtG ht/w0mjoeUKiPN0Fd4YDZOfVPz3F4jxRUed9UuQF5dAUtwTU7O7SFIZ4Vpp52WVwb9C+ SxPlgPS3O72xLk5BhtzMcbSRZK2W+uO/Cq0Bgyv0JDUD23GMAHljQDAvqO1KEL/whvpk 07gnijEoieEsdj6M3ghtP+NY1m996o7DdWeHfekHJuFkOLzegIUKyBkgGGcYqyRExSCB Vdlwumk7EYYc7mPcf2GddKYK6i5chG9EI5Wq+fJVdsNytgWliLHpJGmNei4PeFVUYZLd xdMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=PtPhmg2a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d18-20020aa797b2000000b00624ac1abef6si2117582pfq.218.2023.03.31.03.20.07; Fri, 31 Mar 2023 03:20:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=PtPhmg2a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbjCaKF7 (ORCPT + 99 others); Fri, 31 Mar 2023 06:05:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231630AbjCaKFO (ORCPT ); Fri, 31 Mar 2023 06:05:14 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9963E22EBC for ; Fri, 31 Mar 2023 02:59:42 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id p13-20020a17090a284d00b0023d2e945aebso8347625pjf.0 for ; Fri, 31 Mar 2023 02:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1680256749; x=1682848749; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hIf6WOekKcX5cYk5n6UfHyTuwolCuQ5aOTxYYMf+HPA=; b=PtPhmg2aC8P+Z4aYfe2wqtWdqq0d75n9RQ8QZGKaFFSoQGsEsznX0levtSQfAUQpyE QmaoqKMHKyq6/wvyKOuqug7BvzKHuy4Wq+9cGKRvRDRb4uK9pl9/MXwxtOCMDeixkWFO AJGsLyamMKz79eF4DHPffk3B6A05IsXirDqFUCjz9sluWrOphcBmob3JkKsqaWS2K3tR v7NK4C5XZcOGpXL7F3qVduMlRWL01WXawCXVPBgKjDM9YShB7nXYjAN8JsGRuOWlnUGm H9jD1lHNXyeTKCkKqzVPnjKjuBnCgFRhOSEUPVHDgAFduxFDLbw5XIMdnWymcdxc3M3x O4ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680256749; x=1682848749; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hIf6WOekKcX5cYk5n6UfHyTuwolCuQ5aOTxYYMf+HPA=; b=Kbhz050uh+sTiffr4wH/4pKuimCto0d7QYr8x3PV7kttmGpcAvCn9bYxEjpE55wzbt NvG+GyOjdzwvm9XJ2CEa+lSU+ADC9mvOGxCPakW9PlZxJXmt+8TF9yIC+Eodeb7gSYJI bTdJk89LzlyPOJpeTIq2w4NqQGhvLlyx5ub4XbS+kBOjWSsR4zyZxNa4mLryjcXYM5Ok HBsHd3wuc8sYS+Dcver+1SHVW9PcceKdtJ8CTtOb0Po9XuADA11OGNDjNrbguPYH0q+d fFvQgqZ3CkvId0dqAf6uQsTge121ZbZVkClX3bTaq8oTzKn3UDgM3I0XDUbB06QFRcCA R5iw== X-Gm-Message-State: AAQBX9fXz11rqglcK7VYL+Hbqd7xvK+QDvEm9i2i8qbiyugbP5ia99nz FfmsZ27S0QgU0u0IAdMUn/5irg== X-Received: by 2002:a17:90a:d195:b0:236:7144:669f with SMTP id fu21-20020a17090ad19500b002367144669fmr22262989pjb.2.1680256749585; Fri, 31 Mar 2023 02:59:09 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.229]) by smtp.gmail.com with ESMTPSA id oo5-20020a17090b1c8500b0023b3179f0fcsm4687782pjb.6.2023.03.31.02.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 02:59:09 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, willy@infradead.org, lstoakes@gmail.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH 2/2] mm: mlock: use folios_put() in mlock_folio_batch() Date: Fri, 31 Mar 2023 17:58:58 +0800 Message-Id: <20230331095858.51810-2-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230331095858.51810-1-zhengqi.arch@bytedance.com> References: <20230331095858.51810-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761878233585947200?= X-GMAIL-MSGID: =?utf-8?q?1761878233585947200?= Since we have updated mlock to use folios, it's better to call folios_put() instead of calling release_pages() directly. Signed-off-by: Qi Zheng --- mm/mlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mlock.c b/mm/mlock.c index 617469fce96d..40b43f8740df 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -206,7 +206,7 @@ static void mlock_folio_batch(struct folio_batch *fbatch) if (lruvec) unlock_page_lruvec_irq(lruvec); - release_pages(fbatch->folios, fbatch->nr); + folios_put(fbatch->folios, folio_batch_count(fbatch)); folio_batch_reinit(fbatch); }