From patchwork Fri Apr 18 07:52:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Liu X-Patchwork-Id: 14057024 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 EBCCAC369AB for ; Fri, 18 Apr 2025 07:52:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DA3B9680002; Fri, 18 Apr 2025 03:52:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D2BD7680001; Fri, 18 Apr 2025 03:52:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3008680002; Fri, 18 Apr 2025 03:52:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8EBDE680001 for ; Fri, 18 Apr 2025 03:52:35 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AF249B5238 for ; Fri, 18 Apr 2025 07:52:36 +0000 (UTC) X-FDA: 83346397512.21.B7B6EB6 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) by imf21.hostedemail.com (Postfix) with ESMTP id 089F71C0007 for ; Fri, 18 Apr 2025 07:52:34 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Is5Zvjnn; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf21.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.179 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744962755; a=rsa-sha256; cv=none; b=HvJ+S6ss6HSnz4MsE2Cd+DbaoC3y8cL8VxTWSv/qDuaY1JtN5JkjWp4ZyWVMW8kbNg9fBr bbzrYQ0tf/NzKpKEDltzPjGDG7KZ7qfGo5OVdqq2VXMU22+LcdDp1R4qv4uGS/jCZEYaAd 3iLfsNnY1TPScqPpjJXo2H98CEI2ywU= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Is5Zvjnn; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf21.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.179 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744962755; 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=OBuEFz8FseY66OhdFa8eDqvIegINB5zk/KQ3fZF4sJY=; b=fuaHJDLdoPozhswhizPryoMIlS62H7LhhdnQek4TGfhNEL8odks2fj2ms4Jc7LDTvbKOKA ccVggGM2//ZChtdSgPph+k0SPbVNtgs8nV9f/IS0/UgdHbTuygB2HYcOF1Xi000vSnN0aZ usrDoJKRNtBxJU+AAzdxCqQpW9dHN5g= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1744962753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OBuEFz8FseY66OhdFa8eDqvIegINB5zk/KQ3fZF4sJY=; b=Is5Zvjnn4X8fS8zZ3/kNEPaYpd/V1g8dYQpNa3x/zLvjA0cctPP0Mff+NFxkq9HQV8NZem MEbbq2AMlBufVavqscwoB60P3iQzDotowoXfDygDArQEe8sVHttPTxynkbbTS1bozBwlgO G/icmQKZoVcCID7gz5xyhtUqzvsGp7o= From: Ye Liu To: akpm@linux-foundation.org, linmiaohe@huawei.com, nao.horiguchi@gmail.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ye Liu Subject: [PATCH 1/3] mm/rmap: rename page__anon_vma to page_anon_vma for consistency Date: Fri, 18 Apr 2025 15:52:24 +0800 Message-Id: <20250418075226.695014-2-ye.liu@linux.dev> In-Reply-To: <20250418075226.695014-1-ye.liu@linux.dev> References: <20250418075226.695014-1-ye.liu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Queue-Id: 089F71C0007 X-Rspamd-Server: rspam04 X-Stat-Signature: mcmpkeu6k6o4qm8h5jao9g5z9uokz3e9 X-HE-Tag: 1744962754-48312 X-HE-Meta: U2FsdGVkX18drLgRvrEpy7e/9X5iTbyPWuKihW4MC/nAZLQCjae0qtsSvq5c7LxY04ODL/5oLFkf8iUQniMvbklR+s07+ZrT7niiBz5RFFG9sisCede9sivr4Nxxp+RisJbra85UFV7p8MvInC8/n2bb2H6Yof4uAJ//m6Sr9P2kse+az6Y9duowIwwGkocqqWi55Yq5XvNAIreLH+T+USGqLevDWlTjotwDX2VnJ1/781Ryc+jxsN5Zv04193sMu2khfh7P76sB/+tvjIepNl7goT6cc8cfp7Ejh5kVjgBBMhweUTGXJkXQSuxYCKepfRP+O/QldYAe+4l+m+RrCp1qhvq3K2tDZnCoQShh6CWXGB7k2vlzMlGT8kRkmIeX7cbtNPtayWbhFbcPGqGr91QOpPCd6lpJvbk71WXu1fQLnmhy6rTcOWnVOBuD+8saFP9ksLbh4FvxZyW78cH5luIrFVADOVQBj+2DZ0ct7F7MFhcZoerId2xwv7ZYEDDuOcrBAqYaueya0MvkZB+8uJeVobcv3PTSj5s/Ttk4g5fGy6TJe3iA245NajC6EsGrVdzhYfBqBR3J6Lpap9uEUPAk5VYf4VU3wMeavR7jTAam3xfpfvUMXG+o1EwnB19SlsCrPU1c1du/lbx8Wr6+s/RbmS8MYhm9JzHQvPg7WSXL0853v6M1K8isry1FQ+u1ubre+jCGHJT7KEE45B16ugjlqawSHOajwoMP4Zey48A+4FQe5vx0tKAA48zsOK0eDWVrP/z6cRAcYhdreq/7Mz9nTWrndcxyplB0Z/V785UPxCPFR9rv4irSV8W5nJhoansAikgNLxDldrImVztN1UMxlcFgIebkbLN0I2FB1mfAxsAVacYF2eRigKh5T93NbXZfAUlOKcdgfAqXNHXC34rf5oE3q8mZtXMCfMeRFAeA/1OOH9Crg/QfWI5HN0jvXRrDO3yV21qOO74yx4i TYslVNRH KpmDd25UFC5ga3KPrq/W9FV87ZlCYWSagfL/NN2ejdLD6ZGPjQBnyZAuF/lsOQmrj/WVE7rxGK5KEv5hlGlpj/hIj+EuBHGa/Jjqh9GEusVR6+yjFxgVJqXZjiQv8wXk7h4TGZKx0BDk6y2OpRvu29mjH3FjnXPsR8ii7KwJ9d79tIrBJmA69FIQvdqxTlP+lWs5hCbvmryeCEG8EYTdpXz9yhrHDl1e7a1Sv+RWTRYlk/Ac4TrlFenVcuOXVB0LzSA78vioC+vixrs2jL5TpKc9lu+CMy5SoMi0K 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: List-Subscribe: List-Unsubscribe: From: Ye Liu Renamed local variable page__anon_vma in page_address_in_vma() to page_anon_vma. The previous naming convention of using double underscores (__) is unnecessary and inconsistent with typical kernel style, which uses single underscores to denote local variables. Also updated comments to reflect the new variable name. Functionality unchanged. Signed-off-by: Ye Liu Reviewed-by: Lorenzo Stoakes --- mm/rmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 67bb273dfb80..b509c226e50d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -789,13 +789,13 @@ unsigned long page_address_in_vma(const struct folio *folio, const struct page *page, const struct vm_area_struct *vma) { if (folio_test_anon(folio)) { - struct anon_vma *page__anon_vma = folio_anon_vma(folio); + struct anon_vma *page_anon_vma = folio_anon_vma(folio); /* * Note: swapoff's unuse_vma() is more efficient with this * check, and needs it to match anon_vma when KSM is active. */ - if (!vma->anon_vma || !page__anon_vma || - vma->anon_vma->root != page__anon_vma->root) + if (!vma->anon_vma || !page_anon_vma || + vma->anon_vma->root != page_anon_vma->root) return -EFAULT; } else if (!vma->vm_file) { return -EFAULT; @@ -803,7 +803,7 @@ unsigned long page_address_in_vma(const struct folio *folio, return -EFAULT; } - /* KSM folios don't reach here because of the !page__anon_vma check */ + /* KSM folios don't reach here because of the !page_anon_vma check */ return vma_address(vma, page_pgoff(folio, page), 1); } From patchwork Fri Apr 18 07:52:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ye Liu X-Patchwork-Id: 14057025 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 546C9C369CF for ; Fri, 18 Apr 2025 07:52:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2FCB0680003; Fri, 18 Apr 2025 03:52:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AA3E680001; Fri, 18 Apr 2025 03:52:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 14DA3680003; Fri, 18 Apr 2025 03:52:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id DA381680001 for ; Fri, 18 Apr 2025 03:52:37 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DD369161677 for ; Fri, 18 Apr 2025 07:52:38 +0000 (UTC) X-FDA: 83346397596.26.E35ECB1 Received: from out-186.mta0.migadu.com (out-186.mta0.migadu.com [91.218.175.186]) by imf22.hostedemail.com (Postfix) with ESMTP id 20EC1C0004 for ; Fri, 18 Apr 2025 07:52:36 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=aSDK3B9G; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.186 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744962757; a=rsa-sha256; cv=none; b=L9I8BvIo09iJOKN0ZJpLAS1EQ47Supe95syMNT85n/yh327JI2uSrktB/EQ02R5pngIwud RYziU6qWAtKW+7lNO2zeNN+LFSHyVV1ut1yelZL+K7RXeP2prwXPJKU9hPoc0BXnNKLbGH iyxrzY9uK5Vg28dXRXQs5CQlv2AygpM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=aSDK3B9G; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.186 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744962757; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oGO08xLxOYFwCfCougkQzxDVIQkhT4UpNDlADOdXRwg=; b=s8kCQHY0uJgI/jT5/i3pPfgnXP3MW+9i6RLj1W1fhTmCZlWUSt78KCXU62mzeON8ZZ0Ec/ 44LADsBmskLCVfgsEAcO15v5ns8dBLX4Rc9zPI0x6FurVxR+huUQXxQbhK3qJ6Oy8r4kdY opCnrI7RM+DAAAHPWUlDI/lFYo76ZSM= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1744962755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oGO08xLxOYFwCfCougkQzxDVIQkhT4UpNDlADOdXRwg=; b=aSDK3B9Gdkc6xPZClLQveXZgHE+BbIv50MzsXv7VhKPap4JbnCo27Qo+f8UC7+CXcZG7gk RRjz/wPHtPRIbJrCcf6g47tQtB+kyfz9ZUfh9hWbnZeDSq7lIVhoZ/hHDyql9dm+OhuYEA M9QZEwThq4CPq4sH9WX9XR5okq20jUM= From: Ye Liu To: akpm@linux-foundation.org, linmiaohe@huawei.com, nao.horiguchi@gmail.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ye Liu Subject: [PATCH 2/3] mm/rmap: fix typo in comment in page_address_in_vma Date: Fri, 18 Apr 2025 15:52:25 +0800 Message-Id: <20250418075226.695014-3-ye.liu@linux.dev> In-Reply-To: <20250418075226.695014-1-ye.liu@linux.dev> References: <20250418075226.695014-1-ye.liu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 20EC1C0004 X-Stat-Signature: f1ojwruewccipwxrngbeg9yb164157e7 X-Rspam-User: X-HE-Tag: 1744962756-12405 X-HE-Meta: U2FsdGVkX184T6PNgTloFjPkybwzCNdGRpf8buE5ZL5M5ddI7WwUSDs+sg996jGnEViIMYr0BzFAMqxUf/MAjB87uruIgpknv0z1plazgalESBtU6jN6FcDV4Wvzwwu4QR5PAlDI8H5UsjHTVOKUpcI9hd2z/mpV1xdkxnwJuJ+53blDXR49h//1WDLvif2GcJN9MfM2ZKPzHsDnvl7t4TAkRQh7O8g2scWAOVJ1kp8ElJg3ulUl+6iUM9BSGUXMHXVZaFPZwor/GrmHAUMQilPsvJFNoeHID6os/jFdwYyR8Xp3gJ1qfErF55CCvNr/vcsAEJ+0M5qIBGcagN3BZZnIk+e8jU/Cj1naQaSSYfEfMtzdjy5LH2IkjR3ftTr2yQOnGAFw9+9evFk3v8yGnrWH2FvHqlgJRMwm7/pquUhIawvTwdC5wuS0GUBH3biq2GqsXuF5II/AHB83HkddvZh8c7w0iuE2gto2OOUg/ae3ulP6ylLXXmmmtyK5qnTuMIS04/+tSzye94OEpccIv0MfFTUEO28MwerB/lf8CTii5TZ+WcTBy3ZPZhGKwmRjxBclnv7sDAE2qvqCW6hiaOxePVxt4J4G9D9l5A6mv/eOgXfJyb4vCF/G2iNsLunZI4CYFW1llQOi6Np+1rZBOYnl2uFpfskmrRdW7b7JL+ihEEbnOISu52/YI+nlUUUHyKB+NFKfjkjYdlRCkgvCf6stX1weiOgvKNPNDh8yF8hwnwoJG+/vCQCdjphlGwi4f0xSpuzHfpmvHdp2SlxfGHTidToAA+7pkHcmMZL0XWZelvBsil2CsVw1WcZdFT9kyN9mvwXwDUk/cQ7h1GGmOASQhVaeUdEvSQblWSTCsMG313yHbRWHVNW91fQqjQkvykqOKLNh8j1ImZbPCRyeJA5VFa+ljVWlXlvTwO5/XAdW2t0R/MmT/EWGB/m710exgyLvR3le5LeRnSNc50l 5fQib0vq WMpUPHADot1Tg4/g0Fw+kBROSS/aUoxqlBkLhI1yC+U1lNQi7SE/0xBClOoHSVNQNl1u4LYRfNoOM7Scsa8wPi3/MQaB4+b16j5sKqdhWMvjM8R8yO5iVzzDurW+pTXYwv0uce36zocGCVQZ5P4qhQpzcpofN0Tz0QSG4OkJYaqg/NcRqly+t5ooAPmsFa70R9mLFGdXhVi8HUuDIwEs3ASZYbJ0jndrSXoS69YioxXPQY9r2X7NWL1F+FiQgmxuhWN9rwZnLZZC57xnNSnsl2aOLjkoh/NcXehkdJZIkDkNoYmz9qrEMXYnVHPWSn6udMz9+AEsbjeFLAlI= 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: List-Subscribe: List-Unsubscribe: From: Ye Liu Fixes a minor typo in the comment above page_address_in_vma(): "responsibililty" → "responsibility" Signed-off-by: Ye Liu Reviewed-by: Lorenzo Stoakes --- mm/rmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/rmap.c b/mm/rmap.c index b509c226e50d..a9eed8981e18 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -774,7 +774,7 @@ static bool should_defer_flush(struct mm_struct *mm, enum ttu_flags flags) * @vma: The VMA we need to know the address in. * * Calculates the user virtual address of this page in the specified VMA. - * It is the caller's responsibililty to check the page is actually + * It is the caller's responsibility to check the page is actually * within the VMA. There may not currently be a PTE pointing at this * page, but if a page fault occurs at this address, this is the page * which will be accessed. From patchwork Fri Apr 18 07:52:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Liu X-Patchwork-Id: 14057026 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 26383C369C9 for ; Fri, 18 Apr 2025 07:52:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D16CB680004; Fri, 18 Apr 2025 03:52:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C7253680001; Fri, 18 Apr 2025 03:52:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC809680004; Fri, 18 Apr 2025 03:52:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 884B2680001 for ; Fri, 18 Apr 2025 03:52:39 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BE5A7141522 for ; Fri, 18 Apr 2025 07:52:40 +0000 (UTC) X-FDA: 83346397680.11.D937F17 Received: from out-180.mta0.migadu.com (out-180.mta0.migadu.com [91.218.175.180]) by imf13.hostedemail.com (Postfix) with ESMTP id 1BC542000B for ; Fri, 18 Apr 2025 07:52:38 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="b7/nnHZn"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf13.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.180 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744962759; a=rsa-sha256; cv=none; b=IhaMzNFqNxzpzglTSXd0qzEvQSdbBBDOz/Cok4edf2f7qgNb1pBp722QCllzXLhs8P9wqP 7+UsCJEe9//3OESWI6rMyd5eBg2hg8TJ+55PQCPlO6IJyIT9/VliEA/QohuKsgtYIX53e3 n9RlH7cGSKnxE5GMedirD6PfxoF3b9Q= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="b7/nnHZn"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf13.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.180 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744962759; 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=jfNHyiDXaAMkKJ+cGlnyxg4krHqlNBlOgidwEUdtskI=; b=JrMpE/Al5VTVqt4GLfUZTals+LQ7JxZ8lN3R8rK7zsEj633xKJcIz2jFgD4nXgw7JD6qho 2LooWOMpcx7gjjW7PmXeSAqe9gR8rFSLVhSvpdaIh6PuLH4rjLHARM0VodyqMXni1RrIO5 rGr7uDtF0BkxHi3XksnDCwFRyFGRB5M= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1744962757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jfNHyiDXaAMkKJ+cGlnyxg4krHqlNBlOgidwEUdtskI=; b=b7/nnHZnclVg19ysg8Nipk7mI3Dp+HjYg3vRA6vsim5CIgnseKXebJaEIpxWaY4n0930wX GDOn9Pn1bjFYUYeTA36963vnoeK1r+hPAbO1TLk5jyhwJkFrbsyneOEJFqwrvY8MOpYnQd yW9TPKizdK/bSXv+e8B0k2dGaldeIF8= From: Ye Liu To: akpm@linux-foundation.org, linmiaohe@huawei.com, nao.horiguchi@gmail.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ye Liu Subject: [PATCH 3/3] mm/memory-failure: inline add_to_kill_anon_file() logic at call sites Date: Fri, 18 Apr 2025 15:52:26 +0800 Message-Id: <20250418075226.695014-4-ye.liu@linux.dev> In-Reply-To: <20250418075226.695014-1-ye.liu@linux.dev> References: <20250418075226.695014-1-ye.liu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 1BC542000B X-Stat-Signature: 4pp9m81rp9mr9bee89rz5pmg1upzpu7s X-Rspam-User: X-HE-Tag: 1744962758-948941 X-HE-Meta: U2FsdGVkX190lwZebxF0YpOFEcrieCUZp/+9QtjHayVUQyB0OwiBFBsn00CgenyYjsB4BNWNYZZpvtlDJWjuxPFOw6O5wr7kuTG+DiVdlJf9/rB2cPlrc7MjI5OlRXyJRj3I1te7RlF7UAs9jT+u/y1JY+68qW2DYiSuVGl53z0/PXN0NShgcqcYkMT1UfN+1DT1LdGvqfQGws03ISJYF5tHGnRcmRsMsDcxZ8ibrRdgU/0WnTLhbgL4FBQoOHkXtQ6iEcKXJUOGTg49ojXK1B1b4j8dbSU8nZUcn1HkyKNu90tqcbKWO9hjE9jwQTnrIdnBjsPC6bvh4v6MW86K3DOOfYeJ+r9bl19gZ2OWYQr50qTQpPDuZ2tnX2Qs9ToY7Zn849zAgJvZEuxvtiKmlkd0FCfvDA+yX6Ei9cdouMwhaL8FuyYec6GxbwOHNuwu3Cuj3oYEceNpIFIvBnWy9/9Xo5p1gdUSSSYfpnbINWxo9u5kFUh/USDLPTyHHErG34MN+r9tUnex09dpgh94ZwaWqn3n5YEs+gx32aJ5Y3vnHkUmSiDI9V34dm/TxVPbT3LuELYc0zBtuVoN6Kg5q507ZPFtPmlsWmEpnDJ8GADgRYWPWjH2SD5iiqZUjUwDvKUWYcOdRfjQVcoXAfU966kox7eDYaVNS4hcM0j8bF+FIr+zkkSm+xuqE5DDt6JwAHrUPIxf2CRyLGHnFVcugDzks4SOHfofhDASe0GGBCD50UqGC26zCoFcVGjgHD9JyTp/p3bS6XBCLFi56Y9fCJLfRfNBYYgoAtsdmdUe3BHBc/q6MZ8cXqO2uTo6D+sm01Wy9XtdxfIjMX1li13t9GVeZXXrcSBGvDSmI+mNz4M3J/aT0HA5A3NiYBcs2mxrZzMkth3GybynRu2EBrji+wFFTs3647n3aXFRWRxNXAHNIzvrsfGSaFk8FQZAdX5szgthK/889cfEidSuNDt dpqtBqZy Q9Pzs7W3zoLLqeF2WsCIDAUViyWWCSn3DOsYpG4nAeeReQ5CpBpxHKL2FbI+qTS6QYyOqCxvKhPRPBz+kgu8+0n4D3kXkWRpvjp3ymUqiPW21IANB6k1hhGOmQG/GOBs4OCGJi1L6R2UTbhJtcBCFL1yqiY8h4symY503F2J1ymhGt48ykPy/YhCSQ+cGDedTVV77Ed1CMk8KNWoblDUAra5+SLQo/NgrtVUMySOZkJF0LbdVfRdMYywOhMER0WLSm0BvN+22kREtctYkEekExEKozCCbNseqMzqv 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: List-Subscribe: List-Unsubscribe: From: Ye Liu The add_to_kill_anon_file() helper function only checked for -EFAULT return values before calling __add_to_kill(). Removes the unnecessary wrapper and moves the addr == -EFAULT checks directly into collect_procs_anon() and collect_procs_file(). This ensures that error handling is performed close to where the address is derived (via page_mapped_in_vma() or page_address_in_vma()), rather than being obscured inside a helper function. No functional changes are introduced. Signed-off-by: Ye Liu --- mm/memory-failure.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index b91a33fb6c69..ec0041c95b27 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -486,15 +486,6 @@ static void __add_to_kill(struct task_struct *tsk, const struct page *p, list_add_tail(&tk->nd, to_kill); } -static void add_to_kill_anon_file(struct task_struct *tsk, const struct page *p, - struct vm_area_struct *vma, struct list_head *to_kill, - unsigned long addr) -{ - if (addr == -EFAULT) - return; - __add_to_kill(tsk, p, vma, to_kill, addr); -} - #ifdef CONFIG_KSM static bool task_in_to_kill_list(struct list_head *to_kill, struct task_struct *tsk) @@ -634,7 +625,8 @@ static void collect_procs_anon(const struct folio *folio, if (vma->vm_mm != t->mm) continue; addr = page_mapped_in_vma(page, vma); - add_to_kill_anon_file(t, page, vma, to_kill, addr); + if (addr != -EFAULT) + __add_to_kill(t, page, vma, to_kill, addr); } } rcu_read_unlock(); @@ -674,7 +666,8 @@ static void collect_procs_file(const struct folio *folio, if (vma->vm_mm != t->mm) continue; addr = page_address_in_vma(folio, page, vma); - add_to_kill_anon_file(t, page, vma, to_kill, addr); + if (addr != -EFAULT) + __add_to_kill(t, page, vma, to_kill, addr); } } rcu_read_unlock();