From patchwork Fri Feb 7 09:44:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13964697 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 B0D93C02196 for ; Fri, 7 Feb 2025 09:44:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 423C76B0082; Fri, 7 Feb 2025 04:44:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D3486B0085; Fri, 7 Feb 2025 04:44:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2769D6B0088; Fri, 7 Feb 2025 04:44:37 -0500 (EST) 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 096336B0082 for ; Fri, 7 Feb 2025 04:44:37 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BBA331A177D for ; Fri, 7 Feb 2025 09:44:36 +0000 (UTC) X-FDA: 83092663752.20.E5712F0 Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) by imf14.hostedemail.com (Postfix) with ESMTP id D1E2B100014 for ; Fri, 7 Feb 2025 09:44:32 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=OUoFEwm2; spf=pass (imf14.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738921475; 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=6OliDxvKyBEcspL0hO2n4TFk9yLu1eglYM5udcyOR2M=; b=Qwm2qpHBssVaP8oT6Wiz3o1VTf+alJQZwDBtMy+DcO5Lhq4Js4yUGyhH6c4r0GL9LXkvjn SYcaxKMZX7zHKcw6JHeFFiNy8I0VQrL6/j2+KuUAb1iEYC/KIJPzDXZco8mo3YUIHhFrK1 4oRHoIaNjzZEy1al2g6IcykGatPeXcg= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=OUoFEwm2; spf=pass (imf14.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738921475; a=rsa-sha256; cv=none; b=x44LkF0x1VNLOGn3FyoJP0VlPENzXPYfTNekGbAW4gs+l1knuuj9yCbm3Bc+GrpeVe7gYR bjJUxwDi+bg9eUVD4yDP8ev8F9rbO9izgCpKf9HH8WCV/df+BDIZLTCSNJ0PXe8q+HNKaQ 15u7+behv7hUF7phVJxHVFuT8i8+/1Y= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1738921470; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=6OliDxvKyBEcspL0hO2n4TFk9yLu1eglYM5udcyOR2M=; b=OUoFEwm2J7h5FTEs8ZvyMo+0JIWzk7Tz90Vel8cNyE/hSqiBTw3koLdF5o7TtDJDDERwWqBH33sCkTu8Yi40cJnzGv4EfKVaacYU5CjJuUFDfx3mh7YlDYAIlyjonIk+A4jV9PDGf6JvYS35NQhUVmQcxO76FtNwC+VCfA+9j/g= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WOz4ojL_1738921468 cluster:ay36) by smtp.aliyun-inc.com; Fri, 07 Feb 2025 17:44:29 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: david@redhat.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] mm: shmem: drop the unused macro Date: Fri, 7 Feb 2025 17:44:17 +0800 Message-Id: <69264cee1d938442477e657004e4924f8a5c4dd4.1738918357.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D1E2B100014 X-Stat-Signature: dye84mg16bhquybnw66nxd5iqtz4q47b X-Rspam-User: X-HE-Tag: 1738921472-635966 X-HE-Meta: U2FsdGVkX1+tOhBVuHvNY01oR9Wp1vNfUUifHMaqTnuKkAi0GzItPCU1oBEvIhPA9eaXUHXahE9ZSvjhs4q8D7mxYUFWo9JmwD6cDeBYyFQPmHy5J2PgiGmmTjn8Yv+/NJSSqa8cCVb5oj1OqNSENRY5VhWgBqJa1PDvZ7RYwZho61yIlyUQ55Fr1ycT2vEDYO8f4xjJU/gLiG3a1W1UZAYQ/80sJYRWTHTR2F/mYOG+zZJDNiRat4zIKsSk95SOQP7ydJ7+Zb7SarxVr4sFo+F0pYNuA6Imzuj6EWFjRqsK8Xta2oS7t2LWrw7DeVU0Y3J+pvODu2AonecyP9+peMR7UzF7qbMUPU3NVUDJVrXZPbQCaOgaCsVs8GoYhNrHjvNYC9ocM3Y9/ULnIwsQLg/TU3+6EshB/pApOpaGUBk7gb38LTUrrqKVMpDO+6mFbba/LsyV9IJKhymcuf2Qu97J3kg3Vx77WO3zUCz+eRayJWtRQUEBvvaB9DG5PWxN18ShXPpPacbSxSyu5Le8HWAg+2WvbE44/1syMN1IygxVmdOJZoJ7TE4rCpbgwe+XFh9bnDP213p/qbzcTucAsWuQbjFEQy3VDKrBQTVaUASC9nRH2PoPpHSNoBehcOy0Mbor361fFW8KoBG8x5bYpUzsi0BMSmivmspaKBd++RFOZyX45ko7FNhJLo3At/PO70P4mVfuekRcVoi/+ydEuKKhd2xhDEMKdh3hBEV9HcvnguSRzBpWgVc1EzGhjakXrkoOcFbfB+y7FCtBQe2eTxHg1l03CQXdKiyHOiO1wpbUDp5q2ID/mN6n6NmY8vs4mbG7vAwD3NagN0S01K0xhud5+WjU/e7TqZ0CfmY7TcQQrEXkYFM+2+RMYxlQc40q6Y3Vfigr6jHFUZa/jdUPBOoGBxQXEuPuChUiP1+QoLnB1Czp0CnR/k+ByKbz0kYH423oXJqC0T5XQqwlvwN Rh2WODn0 rePgrvrwoNadHytX+Jnm4a90v7KoRrBGAID/BG0VrY2RNcvpx4ijvCFOr0supLMIMmPdrcW7VpUu1Png5bifWo/rZYXWlKOhJUpH+FOKajOJmYXtXeDZb6Gdo3y0yP2+Qd8hiQPYX4IGxfYSiBqEKWHNPefe9zpZ9hFbb6A664LGUF5N1lEaJD6eGGDL1M0UrqbSqitKpTK0a5sF7KZDbC3yKIOewWsuzc9tby4ZthgWuP0I8o0Jv1D81xNsem9ZFXQEGNNapl/S0nkW/OP33WrC14SYDM1Xn/4cj X-Bogosity: Ham, tests=bogofilter, spamicity=0.175004, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Drop the unused 'BLOCKS_PER_PAGE' macro. Signed-off-by: Baolin Wang --- mm/shmem.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/shmem.c b/mm/shmem.c index 745f130bfb4c..ddf800357e7a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -86,7 +86,6 @@ static struct vfsmount *shm_mnt __ro_after_init; #include "internal.h" -#define BLOCKS_PER_PAGE (PAGE_SIZE/512) #define VM_ACCT(size) (PAGE_ALIGN(size) >> PAGE_SHIFT) /* Pretend that each entry is of this size in directory's i_size */ From patchwork Fri Feb 7 09:44:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13964703 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 04F05C02196 for ; Fri, 7 Feb 2025 09:46:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 905C8280001; Fri, 7 Feb 2025 04:46:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B66C280007; Fri, 7 Feb 2025 04:46:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7628F280001; Fri, 7 Feb 2025 04:46:01 -0500 (EST) 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 5749D280001 for ; Fri, 7 Feb 2025 04:46:01 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BFBC5A18CE for ; Fri, 7 Feb 2025 09:44:36 +0000 (UTC) X-FDA: 83092663794.21.57D81E9 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by imf23.hostedemail.com (Postfix) with ESMTP id BCB1D140015 for ; Fri, 7 Feb 2025 09:44:33 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=F53DoYrb; spf=pass (imf23.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738921475; 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=fDtKOoTlfOTw82XR7J+JbdVd7+T6vjeWrc6ajVUoZGA=; b=hbkas7DANIIyfX+o4cOcA/wApG7YVRaueoeVLYBBcqW+Av1/dVLucPIGTRrEWSYNcTYnCu miu1o5mBIgsw2S3l5m8GfGdtY43c9/ysa2ScNDD6hGREEdWaKqqKZNJezcwgieCeEuvHYO f4QAYy2hNRYaeXPk/AGA6P5Gffcsceg= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=F53DoYrb; spf=pass (imf23.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738921475; a=rsa-sha256; cv=none; b=cGHPfTDnuUrRxqrScJhTiDAMIJjfcyKzfP2/9m3hmWUPY2/2s9t7MmNJ8thUhc3PU1pxPX yklqOn6waQFJaeRgGH/L/5+2vCyguSFfI2l/QCq3Xg8FfS1kakZXjsrRKFDSSlpsaguDCd f6xgKzc1wurxODRGt8C1lI3u7kD/aN8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1738921470; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=fDtKOoTlfOTw82XR7J+JbdVd7+T6vjeWrc6ajVUoZGA=; b=F53DoYrbzEM6WJ2hvRHp/AOUl/w/O8pWeuDEk8PwJ0jjQpu4lStOevA8KL2oAydD4iucUzihkioQ28ngjf0zqKJeKr2Jf3OkGwXjMIrLeLR2qfpX+S/O9WnNWpOiqqc/LXW5GQqN08LEd+9v/b9JJJk717dKQcHxGINPlzGDkdE= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WOz4ojg_1738921469 cluster:ay36) by smtp.aliyun-inc.com; Fri, 07 Feb 2025 17:44:29 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: david@redhat.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] mm: shmem: remove 'fadvise()' comments Date: Fri, 7 Feb 2025 17:44:18 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: BCB1D140015 X-Stat-Signature: nsegxym3osi7wpqxtzfz3sg7rz6dd3fn X-HE-Tag: 1738921473-227443 X-HE-Meta: U2FsdGVkX19wqkBl8+WDY9GTKZi8sWupLgF2yTCoLx/ZVQ/fM1A3mRRNBvJEd3bXeLRGU3ZiOkjBFes9FfWEn2pCsH3TXC0Z6aq+GedZNlmWaSiCNEkMDNIOodYRvMo32EEh2Bx1fILrb+0BKvs+2j1x9PbV9hDBCg3VqnNILgdw5QsK2T+Y5GaDB1vBXOpA86QLGfzTKNwpNxx4dyzyDEVUBJkOYKGArMf3pns2ytbmSLt+k4am0bq26oJqfU0meXxNVrloKgsXoo12vl3gwo77Z1mAEcjkNx4L4/zLHiOre/Hc6k1Ky2OQaAbKbRJ0vc33J/LFJcA8uZXV7DklAPzkjQ2mRu7YvJLES+pi+H3rbj++N9CqdQKhVP6AYMOSIUJNDmUBpVvCrlT8M0LK4AymcS53neooW+YwEpFXo8GlSUEs913y2qcDOkUyQfUCUVNkrkk3vp+PBZo4i/43KZQEQ+xAOwHEEXfpZtmzDeMKlzUJlucLMFlvVt2rcvGiFgOprvWqXdNlD4vSEoOk6jB9SA8gClXvSAiT94+yqZUvhWUGrJPDa2hZJGTBHBANf5j3aidkxRs0f7LuV3VRpNwhcv01MVtiUPah50OVmCrNQcJZ9bBpIT0i6R8ISyB7YvyB9BkxVGrKLluJuS0Xo8Ftjq6FGHszTWzgNMAwiRi9iavAEd42CSIYhxBbyxFNzHZ5UnGfrQjYP9NYT5RnJhMgik3JZIpuWHPGGr6Bt34OZKw8ofbyEpcjDfh438grerXIkGJHtkoRRpRgZshD9J6DRHmRpBzhy9DWAszkQr+Cce3tYVIctbBq71KzrGp1oZx/uZNMmAWT7+q5QZLMTBOyVY4Us0Fg510DwD3I4xUFFAV5bWm4O7uSLSy4pmipbroJS7XIAwthlq6gjI96gnZ5ts6xYlm4gcDPdGENmU0RByjvyBB4Z/2uWJ7zMPvsxPoevBUGmI29wgOeqcx 7Hm5w4vG 0YGPHS9BQrXfWb1Dc9aIvL1ZIRiH7/xz7H+k50jfsixeqJ6VqS9mb8AF6GrpeNnzjYpb3jJWPiecs19SSIWYBuzK9jZJmfRUbcRBUGeJ4cF4iTCnOP3pNK0uZ6EWQmHyAkyWee8RxzvbycbMtQ67Wj6IL+VkOFQfN+unmMzs9kSrk44lOb47tCkBxLm95sSsQgqPBY8XRrV0ctsFGBR1rEp4qK9hnUEGK4wcUl4SB1c7tPL9sFEHNUwd50Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.019790, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Similar to commit 255ff62d1586 ("docs: tmpfs: drop 'fadvise()' from the documentation"), fadvise() has no HUGEPAGE advise currently. Remove the confusing fadvise() comments. Signed-off-by: Baolin Wang --- mm/shmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index ddf800357e7a..b7aef4f0a427 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -525,9 +525,9 @@ static bool shmem_confirm_swap(struct address_space *mapping, * enables huge pages for the mount; * SHMEM_HUGE_WITHIN_SIZE: * only allocate huge pages if the page will be fully within i_size, - * also respect fadvise()/madvise() hints; + * also respect madvise() hints; * SHMEM_HUGE_ADVISE: - * only allocate huge pages if requested with fadvise()/madvise(); + * only allocate huge pages if requested with madvise(); */ #define SHMEM_HUGE_NEVER 0 From patchwork Fri Feb 7 09:44:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13964700 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 02D35C0219B for ; Fri, 7 Feb 2025 09:44:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B757280004; Fri, 7 Feb 2025 04:44:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8688D280001; Fri, 7 Feb 2025 04:44:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72FC6280004; Fri, 7 Feb 2025 04:44:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 53AD9280001 for ; Fri, 7 Feb 2025 04:44:51 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6E326161786 for ; Fri, 7 Feb 2025 09:44:37 +0000 (UTC) X-FDA: 83092663836.02.0143335 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf02.hostedemail.com (Postfix) with ESMTP id 6E9A18000B for ; Fri, 7 Feb 2025 09:44:35 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=iVgKSGuJ; spf=pass (imf02.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738921475; a=rsa-sha256; cv=none; b=DuOc2EZebJrVyVn5WZXGwl647IcO3HAnU+RliMHhxOwwk3pUL7/Gaxbnkvzrf4RlpjVk2V UuYXID7LIU+jV/PlznnOtp26vc4mrS1PkkhtOV37yejnm6CZXWoMxAanaGZGQTQtFmR+rA OuocYjHan8XArdgcT+IvhttYl2QpN/Q= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=iVgKSGuJ; spf=pass (imf02.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738921475; 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=ET2M5RfKIACOkV7gUbUijh4rZv1dga746bLIAUCkeds=; b=rmcSjCW1NV7gZU8soToK/kChI9Yq8Xn1udfMXJHLfWz+Th7ZJUMMD9z34uyxUjY94DLIlT /C9TAIn26uUA3xCa+qErK9guG2t2giOkhHWkWKjJQd7Dz9I6iFBXnPd0oamXbN8tpnj/Eo clYUu7mcSd/OQSPF7fA3xJLIYX9mk/I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1738921471; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=ET2M5RfKIACOkV7gUbUijh4rZv1dga746bLIAUCkeds=; b=iVgKSGuJfWQ/3ueMrxUy2Np0vqR+xXpEYz/3hq08f1wcK05O0vmRAhL1OgGHSH1eSI48RycCU1p6mMjDVHZfntZ4QQWC9ecGeBGe/Y/awO8gDttdN0+1k1X9UvSTng2IxiseifEjlVQrc55SzbV+40Mr7pG/5/Pb0HCX+U+bGOs= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WOz4ok4_1738921470 cluster:ay36) by smtp.aliyun-inc.com; Fri, 07 Feb 2025 17:44:30 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: david@redhat.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] mm: shmem: remove duplicate error validation Date: Fri, 7 Feb 2025 17:44:19 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: wq4ik65tdw8smoak8bbgeobw56ksh1yn X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6E9A18000B X-Rspam-User: X-HE-Tag: 1738921475-931821 X-HE-Meta: U2FsdGVkX19FUYJnic2yqtRLIHYuyiac9vDFlFKoQhZfRcT7vA9wAmsFqgogcberLw9ibQcUIx8gSjSB+m53ZHusCtPY+z+z+S7h7r/wK0O5VNHAIIQZ8JuBW5Xx97/hYWXuCfPnogpfwxxA+kY2lCtxTqL51w4zQrPmsuU/6UExQFe0AL5zXMQDN+1jrgMwWo6pN6yEeujLJR8rMbAzMJvemZMPIIWlXMiXKNfzxoGoBOk2883lm+Cc/xOQ4OKQND4UD6Fm4uyh1GnMDosHkDjHtZMlw79lq/nHXLUf+S9SiA5km7D5n44ADt2E6SfVSrjeASqY0H0gak18VoDi1FSxpettYnTADzx+EqtTKoPQ7xHd8BxvdbFEGrVcRP6M4b3641DwCcnDZx2TQYsgZSMkSCifkAK0aPvxuZrxXx/22HCrHdEtFZa3aA8N5MQFbRzuqu8QFw9l62XMTrs45vZvQiWAbnNT/yzDBP3Mnexy575R0/JQTgafaMLh4OmE7vyYKu7R5NOCDKqv/4Uc3LQ4XZt8LbhxO7C70+K28cX92XL3H3BtQn8hdmlVOeRwGRsmWO+qTxxW4/4mw9n8kbm7k7Ki1bZrKsCsRmSnvUVqMaAl0bOGt04NPPRn4VyXF/CzM7xwHTejPukpqxAJ4FfDPXFB9ZazvuNGL13ysV2VUY9ifal7UJouDAwKlzzt2nbuzVkxpyYYprNNIbiUzwbtJ6GfInGQ8CTAoyhlnjYwMAMDfsCDYEP1suTjcrydG5EsZ9fYSHoJXn83SYmtULIdTvB8NXXEz6cxoCLyci/U8w97BCjyIub/yfz0H+NLvYEtL4JFpCdhpCpZ1Of42g+9YXtiksukIXRtn5s1MpLl/Qp7/QMldamx699tS9xpIxKEjRWfWgZtLIs91/zDhRcMoqucIFOAirDHH4o5i3ENCo1qwVz8lnol79mmuPt3yYa3vhpVQ4l8RM6mmTf +VXAXczq UQ+Mef/qHrg9jryVW9pfRdvk7p82SfeOn1PjvOJAbB0kdKRZZmAZdngm8CNDYA1L+RJJkyFIarZ/0k9+BmUfNwn8i1gmoebSTJAHLbj3sxT6Ft6oz4RfM2kRtjy4Encfl7U0379MEhJVwGWDPISbUVlkzkJn/PL5EC4GYHRK+4qsHs6ju0jgQfYCfSUWdVoc2NHdRvUtHEPJxSVZW3jnbZ0p9aIs3QP/n0zkf X-Bogosity: Ham, tests=bogofilter, spamicity=0.053615, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Remove duplicate error code checks for 'start' and 'end', as the get_order_from_str() will only return -EINVAL if the cmdline string is configured incorrectly. Signed-off-by: Baolin Wang --- mm/shmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index b7aef4f0a427..b764ad336598 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -5650,19 +5650,19 @@ static int __init setup_thp_shmem(char *str) THP_ORDERS_ALL_FILE_DEFAULT); } - if (start == -EINVAL) { + if (start < 0) { pr_err("invalid size %s in thp_shmem boot parameter\n", start_size); goto err; } - if (end == -EINVAL) { + if (end < 0) { pr_err("invalid size %s in thp_shmem boot parameter\n", end_size); goto err; } - if (start < 0 || end < 0 || start > end) + if (start > end) goto err; nr = end - start + 1; From patchwork Fri Feb 7 09:44:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13964704 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 9B0DAC0219B for ; Fri, 7 Feb 2025 09:48:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 389D3280009; Fri, 7 Feb 2025 04:48:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 33900280007; Fri, 7 Feb 2025 04:48:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2288A280009; Fri, 7 Feb 2025 04:48:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 034AD280007 for ; Fri, 7 Feb 2025 04:48:31 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D1B8E1419DE for ; Fri, 7 Feb 2025 09:44:36 +0000 (UTC) X-FDA: 83092663794.13.514090B Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by imf07.hostedemail.com (Postfix) with ESMTP id 9A28240006 for ; Fri, 7 Feb 2025 09:44:34 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=bGM4ZQm2; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738921475; a=rsa-sha256; cv=none; b=FiykyslehMvKudasK/1uLCLv9eGIdSlWtZrxpcP6zal2YqHJ+NlnIE3R3tGBO4dLmMt0G1 BxmoJ9+kMb0CVVTqa/1FUB3H4/tbhbHODPoVzKLREHqKkTkyd2oUd7f5Z5Xpu4YEmt+nYY IYGdDZKhJWWzgyaApzQZxoYNygopfGA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=bGM4ZQm2; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738921475; 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=kcZEGoLAZWYmpxFrSA4KxILcMvDpALoGBVXuA8rwiuA=; b=t6uRlmbHyGpJ5+D//+WtR/HcjhjyZ3Jr7IAbdHH9Ki+b/+vCRC6NqgMCs2IC2oE4CWidtF 8DGh8eAHI1UsD6J12orzZwUbx9WPYAl3dvBL58jsr+96dQMiy2xxCg7rRu1xYSG3wbcxoN dsylTGS8HmPVw8lEXCvErdaJEO1Q9M8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1738921471; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=kcZEGoLAZWYmpxFrSA4KxILcMvDpALoGBVXuA8rwiuA=; b=bGM4ZQm2T+6qFM4Vh9dklNqjJSxaxY3ErMKtdiuA1RrVrwrHRCAbH3WWsEj9KPRxYhtgtvo5aHRF1CxOTIcKmbOBqP5+32o2Ldbxlr8c/Uyfg/Rg7hOLR7xGdUGQVGbp872N2aBMo+OF37uxq+QoxAoz/wySKKrvoMVDh92b0YM= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WOz4okK_1738921470 cluster:ay36) by smtp.aliyun-inc.com; Fri, 07 Feb 2025 17:44:30 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: david@redhat.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] mm: shmem: change the return value of shmem_find_swap_entries() Date: Fri, 7 Feb 2025 17:44:20 +0800 Message-Id: <070489b5946b8379b2a2d25f78115cef167cd145.1738918357.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 9A28240006 X-Stat-Signature: msf7wadtt6jwr9zx4aje83xteu35zto4 X-Rspam-User: X-HE-Tag: 1738921474-284951 X-HE-Meta: U2FsdGVkX19uJ7a+7vCVNJufSHuTDqzMYu4y+aVvdN/aKxklKsNYJO6flegASy8Wrg69IIPEsQxdMbICMxZzAtTK9yjBEjGUCT0o8y1sK/Athm2Cg9le+ESrsKp9tp/z0WiLM/yHxzWGHlDvNataONFv1qFSbC0UVAfKveOuxTEz6Pz3AKsZrp1vLlSAl0AD2XmF/4y2h+ASgL8MvlcQ2WfWAykXZXH0Qt7S3PDlzYhb/lfY0lhtowcGDz0wKb8swCwCieH8moh7B9JGAEBLdKBEylVOrPJ3UC7NBkuDrnbu2TQqYdDWgs6FcsaDD2IyL/rMNxDJGSjQF6faTOBOyPocm3W8/ZZusg+UDfGIQMF7rhDNI8NteyXnvD627D1KLSJrWwHmhudZhTx2qFlwmOfYBNeNSVvJGAoWn49QrVcGGKW7Kev/IVp67nfMnPJEzs4yOaYngFNADsnPLkOkGRHSZthNgy6dNbFFpwugGBnWUm1h0nvHSYGSdOtAbcpDY6WIutj3J8mU1eaIPFttwIKx1+MK3WYUY+G42tjL8X2I53U1/Zb4uRGW3TzV8GTwBg+lLQzhl/hbqsDPAgXHqTuRa33HftBvxrpGCaIcp3AfP3ryAu6nc9J3auogm2kIBtP37Dv9dIwaqLnlQ84pFXTvRD7U4/ZcUnS55hMUjy/geB4er3XyGVZg29rjpoxEp76jzKnpxLMcet5vZc9ypugWhNSG4KLxVGRD00vX/6I0d0dfKWNaDhT6gDpEiIP8lS8MXj0IwOM+vpLvYRkJM0HjWnlx0xUhhxfb1V8JQsJ0EnBwqL1lPbbQ/NK90erjwDWm++uSOd0pEJSHU6BNtEt60mqTdR5tHCGxAoBcHpVHHtvvBvwij4ib3g0vBygOvlpR//cEbfjHCv0ca6IJvDR3QuU60PNKQn2IJYOPwsmxNTNhW/B2ToE5S1lobn8hFNS3cSBwCEwV1xViUDD txmtWHgw v40VJojBOqYUafRxc5uNUQCZWnUsH/NsBQCj0sasQGQZ02jZ/fCKD8IYNE5/93bYcV7l60GwOWjqyspyHj7QGp9cjyxnWsZdOnPi4VRK6iBHjt2oxeX+UXNugYd/jWlg8fiyLNHS46v7F+UQUNbbr2VOUQLI7c6CAPhv60IyTk670p2sDx/oVp+gCx78ihTTKrO7Pjww31Ad6FDKjPl3MyMlSdKjSJWW760A6es+zepDi4zSnD3KeU9Q18+xa1HyRc3naUNDeJbcNKdw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.028872, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The shmem_find_swap_entries() originally returned the index corresponding to the swap entry, but no callers used this return value. It should return the number of entries that were found like other functions, which can be used by the callers. No functional changes. Signed-off-by: Baolin Wang --- mm/shmem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index b764ad336598..c243d814f2b0 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1379,9 +1379,9 @@ static void shmem_evict_inode(struct inode *inode) #endif } -static int shmem_find_swap_entries(struct address_space *mapping, - pgoff_t start, struct folio_batch *fbatch, - pgoff_t *indices, unsigned int type) +static unsigned int shmem_find_swap_entries(struct address_space *mapping, + pgoff_t start, struct folio_batch *fbatch, + pgoff_t *indices, unsigned int type) { XA_STATE(xas, &mapping->i_pages, start); struct folio *folio; @@ -1414,7 +1414,7 @@ static int shmem_find_swap_entries(struct address_space *mapping, } rcu_read_unlock(); - return xas.xa_index; + return folio_batch_count(fbatch); } /* @@ -1461,8 +1461,8 @@ static int shmem_unuse_inode(struct inode *inode, unsigned int type) do { folio_batch_init(&fbatch); - shmem_find_swap_entries(mapping, start, &fbatch, indices, type); - if (folio_batch_count(&fbatch) == 0) { + if (!shmem_find_swap_entries(mapping, start, &fbatch, + indices, type)) { ret = 0; break; } From patchwork Fri Feb 7 09:44:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13964701 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 5ECFDC02196 for ; Fri, 7 Feb 2025 09:45:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00573280005; Fri, 7 Feb 2025 04:45:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EF7F5280001; Fri, 7 Feb 2025 04:45:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC174280005; Fri, 7 Feb 2025 04:45:07 -0500 (EST) 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 BD1C4280001 for ; Fri, 7 Feb 2025 04:45:07 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8E60B1C976C for ; Fri, 7 Feb 2025 09:44:37 +0000 (UTC) X-FDA: 83092663794.24.E573A4E Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf08.hostedemail.com (Postfix) with ESMTP id 77639160006 for ; Fri, 7 Feb 2025 09:44:35 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=oMbqE4Uv; spf=pass (imf08.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738921475; 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=3PS22iDEZK02vBCkQcniOhhJpKU1weoXF4MOKLaGix0=; b=f8RYIJSiBGf3Cm6gN4qBvMWMNrfkxsxahva7oc2C/cHrXyWoj9cfecXFVkdF6jLptpaguC RA68/zitweLMkpC6rmELcDGAUb0joyPdMyqf4RoSnTouVh9ea/ApJdlLTEzVvIxeC3sXtC FZxX4ZKQhPa2ADvC2kQ9r/18pSoyTvg= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=oMbqE4Uv; spf=pass (imf08.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738921475; a=rsa-sha256; cv=none; b=RFwV+x27wFBjV6jCF4N7E/aTcxCWM4itVM6PjED2t/NDRiue0UxXDeDJAhcWmZjojc5VPK Z7bjqexSq51yO7MYvnhO9rK9SejMfkvLATrTWJaZnQw4sPQUtfXPDcA2VRsN+grLu9KJNH cq0u2rKArfYFwGgDYq61dxETOUrHjNo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1738921472; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=3PS22iDEZK02vBCkQcniOhhJpKU1weoXF4MOKLaGix0=; b=oMbqE4Uv00/zuNB+vQ/BwfUVYClGY9Hhs6mBblpKB2ysEJKVjoYlXRKyGPlKoyXoJZRNls4ekMwuwRcV+AYapQy//UowJe40KwbSF9ZyK21QFYbOfhv7zYcN4DZHWuOHtQyozcFX/rP0jvf9bsIpKPvYjp/x+PhHtWkMeW7hn8w= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WOz6dmv_1738921471 cluster:ay36) by smtp.aliyun-inc.com; Fri, 07 Feb 2025 17:44:31 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: david@redhat.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] mm: shmem: factor out the within_size logic into a new helper Date: Fri, 7 Feb 2025 17:44:21 +0800 Message-Id: <527dea9d7e32fe6b94c7fe00df2c126203017911.1738918357.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 77639160006 X-Stat-Signature: 9ctkhifg8q33x8b9rpkhrhabtjiy6nfi X-Rspamd-Server: rspam03 X-HE-Tag: 1738921475-705501 X-HE-Meta: U2FsdGVkX1+5eCX++2t+nxupTgL6o31CnWpcRW4EiJK7SaiGkzEGnlVOW7gK+/tzZB/cwfZ7mS1mfpDoGobZTY944ERxDyygg2JblxxmzJXPpRDbJj952TbdXwepbCIrK5xLml02OIxCoH49gHAXqbAAb50XesRLXBeHPpzl0kMqIMWp5cTy/25e/mCbIMlPM3cuUUp7OaR1Sp4Yhb5EJ9e6LNB1X5uplN7LHYNEyeG/RUMcdH3apynsJnoo1PtmYdHlSBBEE2iBLrbSyw9rYGpjOB/sawXpg1p6cbR0D+qW2zifK6FEkMjCPN1zupZmJ/BpjAD5rJr0borR2vpEibAByEx4gKkrF4Jdt/fQ9aC1xWpO1fM1JZGOtt8LhO/i1OIEaaLWf/6Bhx2d5WaMRjwxBXmxdYd5iKwf3n9ObcHJY5/cmtic+C1F0v47dhzBGtjSEUvWPzep2uAI81MqB9CP1mvhPlOdi+ilv5C8i+x0fsS6z1Ice/JrgyrpsyyY8iKJpMRNqRxoL09ou4HSotPp4R3UdyoT+tVj64wRCRkPhMEcWuegLVtVFKX3o20czh6ui5EVraKfZ4u17m7k0WL/du3ObkHIvEQ2m1Xocnv2+dta+m90x0jZqZoxu6z08dFc294KawJbfMixebTklrAwkxEJWmdms8inG3ub69u6FbzI5wk3DyHvrRouG59NUkkCt4MI2RQWxgWXW+vpfCQ1xjrNvUbyBwJAEcjrlpLNrh9Xyo+wIqQoJqNRxm6SYe79VohpFmQmYH7lXSUvvjoYFvvclmjSWOcMuRe36Ct8DPKPKDPXMQ5vqpYP/8oHe4Rh56rQ6HiO0VfGYvq1s7zuTeKs1lbvhuH5fJQ/5jAbyeIWDEvQz1Zi1Wj2hCDSCsF10a5xXdL8EUgs/vNltTcscenKYtq2bMBfriVilfdcO3mE47u22/RJ71NWQX8qkcPwoAzah9gkzpfBbxx zOWI9DLT 8z7Opc4nGvfREguq31/EN43di72r3KkZm4ZCb6QmtFfsfCG9yxObOJttBORgDTEay0qZ6mTe6pMuuxwFeWruL5m+dap+rSy7VAUd/ndj0XsDuNAJGBgy4Zzv8A0lPjU1W6NuIrsdJZmmSwkpKRP5WaSXsh1k5PnuMl4wB7OMskAuUBafajCMOMr7Q/YS64Vx6smmE+ejQz4X+qmhAsh9CAAzUMlVIcfWj03Jm8r4hf3LhKgR0NQVl70iFRqPuVa/Omaldp1gsWpKMx7rSva1NnUmiYyttU0YdFifD6CDkShJ8LcY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000160, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Factor out the within_size logic into a new helper to remove duplicate code. Suggested-by: David Hildenbrand Signed-off-by: Baolin Wang --- mm/shmem.c | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index c243d814f2b0..671f63063fd4 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -590,6 +590,28 @@ shmem_mapping_size_orders(struct address_space *mapping, pgoff_t index, loff_t w return order > 0 ? BIT(order + 1) - 1 : 0; } +static unsigned int shmem_get_orders_within_size(struct inode *inode, + unsigned long within_size_orders, pgoff_t index, + loff_t write_end) +{ + pgoff_t aligned_index; + unsigned long order; + loff_t i_size; + + order = highest_order(within_size_orders); + while (within_size_orders) { + aligned_index = round_up(index + 1, 1 << order); + i_size = max(write_end, i_size_read(inode)); + i_size = round_up(i_size, PAGE_SIZE); + if (i_size >> PAGE_SHIFT >= aligned_index) + return within_size_orders; + + order = next_order(&within_size_orders, order); + } + + return 0; +} + static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index, loff_t write_end, bool shmem_huge_force, struct vm_area_struct *vma, @@ -598,9 +620,6 @@ static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index unsigned int maybe_pmd_order = HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER ? 0 : BIT(HPAGE_PMD_ORDER); unsigned long within_size_orders; - unsigned int order; - pgoff_t aligned_index; - loff_t i_size; if (!S_ISREG(inode->i_mode)) return 0; @@ -634,16 +653,11 @@ static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index within_size_orders = shmem_mapping_size_orders(inode->i_mapping, index, write_end); - order = highest_order(within_size_orders); - while (within_size_orders) { - aligned_index = round_up(index + 1, 1 << order); - i_size = max(write_end, i_size_read(inode)); - i_size = round_up(i_size, PAGE_SIZE); - if (i_size >> PAGE_SHIFT >= aligned_index) - return within_size_orders; + within_size_orders = shmem_get_orders_within_size(inode, within_size_orders, + index, write_end); + if (within_size_orders > 0) + return within_size_orders; - order = next_order(&within_size_orders, order); - } fallthrough; case SHMEM_HUGE_ADVISE: if (vm_flags & VM_HUGEPAGE) @@ -1756,10 +1770,7 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, unsigned long mask = READ_ONCE(huge_shmem_orders_always); unsigned long within_size_orders = READ_ONCE(huge_shmem_orders_within_size); unsigned long vm_flags = vma ? vma->vm_flags : 0; - pgoff_t aligned_index; unsigned int global_orders; - loff_t i_size; - int order; if (thp_disabled_by_hw() || (vma && vma_thp_disabled(vma, vm_flags))) return 0; @@ -1785,17 +1796,7 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, return READ_ONCE(huge_shmem_orders_inherit); /* Allow mTHP that will be fully within i_size. */ - order = highest_order(within_size_orders); - while (within_size_orders) { - aligned_index = round_up(index + 1, 1 << order); - i_size = round_up(i_size_read(inode), PAGE_SIZE); - if (i_size >> PAGE_SHIFT >= aligned_index) { - mask |= within_size_orders; - break; - } - - order = next_order(&within_size_orders, order); - } + mask |= shmem_get_orders_within_size(inode, within_size_orders, index, 0); if (vm_flags & VM_HUGEPAGE) mask |= READ_ONCE(huge_shmem_orders_madvise); From patchwork Fri Feb 7 09:44:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13964702 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 800E2C0219C for ; Fri, 7 Feb 2025 09:45:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B2A9280006; Fri, 7 Feb 2025 04:45:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1632E280001; Fri, 7 Feb 2025 04:45:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 02B05280006; Fri, 7 Feb 2025 04:45:50 -0500 (EST) 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 D665E280001 for ; Fri, 7 Feb 2025 04:45:50 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D2FCA4C653 for ; Fri, 7 Feb 2025 09:44:40 +0000 (UTC) X-FDA: 83092663920.30.8AC7CE9 Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) by imf06.hostedemail.com (Postfix) with ESMTP id CF48718000E for ; Fri, 7 Feb 2025 09:44:38 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=i7gHCJj2; spf=pass (imf06.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738921479; 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=EGHE22JNOgVTm0fKKQ9rTbfnsV4oV5XFAO63xRbgM58=; b=GrWIAnG57zSVCoDwp4fXy++q6/sUOow9SFuoLGb0NUay0tXI1C9FA/TBIYqQN65/gK6fbe 6i0Ejg/EVazBxgIgbJYiy61ftVKeTWJ5RJMypopQKkIXV64Z7MpTsIew8+K/pPZ9qpChNH kHc0BbvhkINPshzlnPh+8hk+Fgxin9A= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=i7gHCJj2; spf=pass (imf06.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738921479; a=rsa-sha256; cv=none; b=24pxwfqtpbgSjosM/ncEw6dv1o5wtQT9kP13Kd7ibk2IgzMAQh5KfP3ijjJoC97uLoSC21 5LCODizKZEmTuyj3ufHSxzL3BT4y+9E31vKTgHG+caFdC+MoMI9PRdVyWwf5TOQ/gfRZjT hOiZhacip3L8reG44KKenB1qu13KJRs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1738921472; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=EGHE22JNOgVTm0fKKQ9rTbfnsV4oV5XFAO63xRbgM58=; b=i7gHCJj2w+RxG2tEUTFWIBVb+fcCZ/rk1BGqLQ3+mYoJGmiXP/ULHwnIzOk6nLiA4yJevicKiWcRAs7q9l+O3/gCGWlR6jL+dN/LX8SV0qTK+sIVpfDUCOP4+Cki7d0BY/doI/Bllla+vgDhs3dYtieHR9i32yXYyKU46yylCPU= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WOz4okr_1738921471 cluster:ay36) by smtp.aliyun-inc.com; Fri, 07 Feb 2025 17:44:32 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: david@redhat.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] MAINTAINERS: add myself as shmem reviewer Date: Fri, 7 Feb 2025 17:44:22 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: CF48718000E X-Stat-Signature: emktnepb9bgj983ux96qazkg8istioy1 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1738921478-404317 X-HE-Meta: U2FsdGVkX18Kkpm59L/6vP+0nuo7sRYyIp+x7kDprhnHsjcMVNwGwOeVEEPSlsF15CGyDTIVtT4CmfimDHrbOgmMtUCOMOovTl4UD8gqVvSCbEiJ41j6R1d9zujPTOBMYeAWwqPv8SYrlRA3ar/u9toGbvVyvZXjPf7qjJ7xA2JPVTSnvlRsyVs9n+ULhCXgQEl13rBd8kZxRLDV2luvIUajnGQX685YGhZJ16tlGwQOm+7RBxCmqFlORb1VA/sIAsODg+nh3XsF0XaJj2bmXO9n/DKGUb0te1KIK6OMQOW91jGD7g6RmwfFgL8uT6Gyyzd8oO/arSXY7ZgHbTPF4FtR4gV1fYn5qH7UO3Ww/Isu43AmTy9FYfZYZcprn4E0RyxxL8HiBEF7ttjhYdr2DEB5aVHxQ/EgtDA4lOBKTJMAjdk6Eo+iFpM1NnfNmiAm2eTotC72POobC7TptiLZOZRMW1h/EAlieFp/Tu9lzKSsNQGEsYO4QzS9hKFEP3ReKcxbsNghefOFC6tbxD94LbHSD1doAaHHK/APi4HYa3LOCkLnIo3KXi2DQAgXV2y4piUTPl8PM5qgJsn/JzCV6KQCMIk00QE9WTDhG+67ABhOF39a/Jce97A0hag1svzDz43/DD9CiIlZvlws3c900gtZsX+mEOqpQQ6Em86jNLAGBcAGa17LEn+f5tiMWQpiXidg34nQAneAJ/DTGfd/VjZrRlrTw7pdYEsWk1zbc+bp8AHma5IAGBzQrKKpFwO9AjeXdTTmr7hhKXakEub6RFN8VBw/dw1DakYLFmysywDnrsRaWlcY374QwtActTRBSSW09Klm88mCcAWqp2CzzDMXTgufYA8oenBs1ll0fWLKWY/pqBpzxW89iUqQRAb8Rh5lOG9bAFRyblL+wKRYJPKaXoRMxFFHFP4wva/s34wtJSDVfF9ti5NB9BWaggBM6CofWA0lHhC4wH/DS8k WeMvlGVr mnBEZLl0qyEnZ5TiNrqciL4zXAeO7NApkhI7HBmuXhMcKFtAtjdQsdUm/LVnG5Ua2xl1kTyLGbfVBnB2/KZTSz+2GG1ho4QyPPX6LnTCdwjZUljEus9KrCUm0eJNOY15EyjNxJfxQ5N/nxwGQKoMJ8bwJg7lWTVJQ18nyGkrrWznb2MCH4OGJhIOjHm1wR9mSXFhx3nnMZnXdXEzVw7xW+yNor/N+8RPdWk/DAEPfgFEKufVrfPX01QrLvYCawSm3ShuqkT9KNNZ8ZvgaoHnIjJ5nWS73eg0rzIo5noqgRV4sk7Vsu/7wOVsgVXLbsBEhwbo5zcEjX19ydBmj+arSx1WCgIhgQnY5jtNgbQnfQSBlOck= X-Bogosity: Ham, tests=bogofilter, spamicity=0.126946, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In the past year, I've primarily focused on shmem and added several features to it, such as support for mTHP, large folio swap-out and swap-in support, mTHP collapse support, skipping swapcache, and tmpfs support for large folios, and so on. Meanwhile I've also been helping with testing and reviewing shmem related patches. So I am willing to continue assisting with testing and reviewing shmem related patches. Let me be Cc'd on patches related to shmem. Signed-off-by: Baolin Wang --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 577592e3af82..7fe4ea237afe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23883,6 +23883,7 @@ F: drivers/hwmon/tmp513.c TMPFS (SHMEM FILESYSTEM) M: Hugh Dickins +R: Baolin Wang L: linux-mm@kvack.org S: Maintained F: include/linux/shmem_fs.h