From patchwork Fri Mar 7 23:34:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 14007275 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 99061C282DE for ; Fri, 7 Mar 2025 23:34:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5538D280005; Fri, 7 Mar 2025 18:34:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DBE4280001; Fri, 7 Mar 2025 18:34:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35697280005; Fri, 7 Mar 2025 18:34:24 -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 139D4280001 for ; Fri, 7 Mar 2025 18:34:24 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6A145B86D4 for ; Fri, 7 Mar 2025 23:34:26 +0000 (UTC) X-FDA: 83196361332.12.8F06B6C Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) by imf20.hostedemail.com (Postfix) with ESMTP id 8D4CF1C0008 for ; Fri, 7 Mar 2025 23:34:24 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=SjPtKj3K; spf=pass (imf20.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.219.174 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741390464; 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=ItUIUWSkaBDo4gvOHQAaaSasVOjEOP8U9MmMhIViMDk=; b=q0JEJ3AqisDLQdiZOjD3rBZec7m9YsxklguzcTOUuCh5ZfLBH7guZaE4Jh0wEWN5tWVpAW DTyy7owRPuwrHWsvBnq32jSzCghJoY55LNDfriYriLrrDBk0UgbH5jbtxGQEo9MeVtoDS7 e1o6qTJNYsZnh080I8awTWoexQIRMeU= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=SjPtKj3K; spf=pass (imf20.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.219.174 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741390464; a=rsa-sha256; cv=none; b=KR7bfVhJrV4m0cwA8KDl/pI/M12ZMKowxp8NtaEz4gF0+PbBvhJWq+xric/VrS3wR7zEMF Iqt/RQ76bCHqMgZeN+mj/NCeQQDroors8JKS0L93oB8u1EnnOC6WsP+bCpc9i4oN7pKlHh q9IETDaB9enHy0x8JbY4M/CyWaqeQho= Received: by mail-yb1-f174.google.com with SMTP id 3f1490d57ef6-e5ad75ca787so2088402276.0 for ; Fri, 07 Mar 2025 15:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741390463; x=1741995263; darn=kvack.org; 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=ItUIUWSkaBDo4gvOHQAaaSasVOjEOP8U9MmMhIViMDk=; b=SjPtKj3KFptEcZcjX/fKMC3CWE15gvNxcKqam6qJ94Vs8+6ARSJjyqUlzKzWXE2wJ2 elM9QPj8BVsyIGYKQ/SUpbeNRtkvCDZjUhmo7ntbSFc6hfcORE+0KLBUWDJQWMlUU2L0 edjjVxQyQ1Ge17IiK9J5XggDUMssTQx+5004yloYdKCJmon8Q0nuaTqNanFNc9EqnIMa UJ9T6RbnQ28pnmwWcohzSfQVMQS4VxMyTaTOqXHamShY+a/4xrgtQRwHptnBOn73uKwN tOhHebINB1VVtSd2Sj1Uy/4gPVuEfCOk5PyLj1K6SFQhHJoZR5p8d+04JhiY1rn7daUJ jtPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741390463; x=1741995263; 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=ItUIUWSkaBDo4gvOHQAaaSasVOjEOP8U9MmMhIViMDk=; b=rpeRrMq3F+pofDjCNYmHKwcH4IrKGsqcT8DMPtL0tAqG/MiASAAspVruna98bqzR5K NOJ1Pu33BJLyPikGMAGCKa30umk2LQgd5i0r4O0uznq9f1lbB3YptrMhSvZg9XxlwGRH glIh8Xy+PXUFznwJlAixcIW1C3cnK6OjQYCf6cOwroO+C3FOcDfRKTATRxOyt0opXe0u v4Cu5rvkU4LSdW73qwrS+CbsST/8f+xvZ6BnbX1Epa8a2u5nU9D8CEvflQWabAhlxpLg cS7OTnxQYbkz6mX3AWlWvixNN8X7Ql7tWrf5kmS60USEeCDXMrWI3BFMqoSLaGvyOMgq E58Q== X-Forwarded-Encrypted: i=1; AJvYcCWPs1rmxjkXqOjSt/k1uHMrZwGLyTnJck6GQHa763v6Q4sWi+xfLiKlJFsVjc0yXoqri+AHufZVWA==@kvack.org X-Gm-Message-State: AOJu0Yz0IR43U+lSTWQ3a9I/IXtINXmGkoZOQhEisMs0ZgjBFBRW7pv2 eJrSBAcI4+dqiu8wdFK6f8rZbAIpyxIZfwOzrcHYfVVXKBryNkru X-Gm-Gg: ASbGncv6IGi+PQ2pHHE6MQRbbp8ETRgw+P/PJCk7mk/x8hr3sjQ6aNiUlk2rQbz/7rx nU7QVqzJxIOV9KANznyi6jbRKCAsvUHIzb73byb7V7UTtzadKx/lnpSlCEcgkUra6PRzLIftxkf QKuuxpUoLK6ZXJngxihjthtROO6Adu1FwLPNcQMsSShOTiuXx5HT2j8A/zYIhOQcAdffRPBy9DL qGiMHEbTCHJWT8CcuB7HUYixFyyL5a3QDy/fWLeLhC806A93QysYLakXqAm0xEfAFmo2OHRI3rS 38S4RBXHjdKhJ0AUY4/p8eFbw/m/nhzkmfw= X-Google-Smtp-Source: AGHT+IGtiAG5HzVRcSvrO3fKhko8Jdkv2p32kH0pPlw0M3D/fuxVWpiVLIKS8UEHrS2CiYvlw8wsGg== X-Received: by 2002:a05:6902:238a:b0:e63:41cf:b600 with SMTP id 3f1490d57ef6-e636f818e5fmr2142208276.24.1741390463532; Fri, 07 Mar 2025 15:34:23 -0800 (PST) Received: from localhost ([2a03:2880:25ff:6::]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e634b8e8ff1sm1049120276.40.2025.03.07.15.34.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 15:34:23 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, yosryahmed@google.com, yosry.ahmed@linux.dev, chengming.zhou@linux.dev, linux-mm@kvack.org, kernel-team@meta.com, linux-kernel@vger.kernel.org Subject: [PATCH] page_io: return proper error codes for swap_read_folio_zeromap() (fix) Date: Fri, 7 Mar 2025 15:34:22 -0800 Message-ID: <20250307233422.658954-1-nphamcs@gmail.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250306230015.1456794-1-nphamcs@gmail.com> References: <20250306230015.1456794-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 8D4CF1C0008 X-Stat-Signature: ndd9ntogoudi5r77moxsb3rodbaeonkd X-Rspam-User: X-HE-Tag: 1741390464-956781 X-HE-Meta: U2FsdGVkX19yXozmGLoQVN/eCibqdYgKHhD6jdd5R1AbCOVN6IPkw3vZrrzoc7YM/Lw3TXB/SMm1uH8bF3Lm8OHIGOi6ROOU3aLXXBdP979SKW76zA8lGuzGwhZwkAYyQf4MHYxsSgecqg4UeustlqqzuHoOkrHU032n7Ga4lExLo/qymoHhgrqNjbLpXhYhm2c2P0ZJRoMmUWoGlaLXEfWZ7w+4Q61aGeLc1VRYJ5r0PIS4908Mrz4sIoFJYgzmin6NFJMsSFNlzMnczkCTsvAPs6jwfsh5YSipxTiSYiKGQ3UjFqRJZ9VzKBSUl7Tv2Iz68iz+NLPJ1d5M4/1+CSCNoeKN5vrbXOlN7BnfcF3sJ7WCzn0Lw+qcH5Vr1hsd5Cx/84+hByJ0B00/52L20vhYqXaXalnBf+0I/dv9dR7i0T68f3ytwUJG7NV9lgpx7kJACBFo2dQzsFPrnm/dadDy9fj5fQWeSZvnWLmGoSRmf9AjCxg4f/BeZlBoa6oqxNthoWw+N/ie3xBEbYvOSd331cjxvQotRMBocFBXB4SecZM0c2GW03sdRQVp4kR7tlhWZHK4BGT3WWLwgOVEmn6XjjSKtuxNaLJu611XmpZYbBETuFm7ilqFPCQD6JnS3jfZ2uGgZ5FJeHerSC7IXhpxGuxKaZy+QV4smULnVpplCJ8/IVZFAtqAbolYx6bN5WhzqQSvW4FyleTRhv5gIvj5VtJntMk4ru+WpAZ8t3sAWT2F5cysCktzowduMcx1JOg3Da6VDLc1/Oc4S3R6GSZA/jkkfWHf9KUuf5xAvnQUqV/pSR7xSc3jsgmHpDZi75dqTQMA3ZVjycDRsxXXY0VnPnTngjvI+9CdoA9MR8TPbszs32reRl9pgQq/vOcUmYBm5+gbdf2YlysuKvzlN9nolD5mrFGKx/NTbH6okV7O7jtxf4rYDGSgUiPw2NQAlFaP8ezFRW5dx4MxzSd QMWWeSun xE8WoZd6sMNeQ4M50BREl16SG8oUoxjQaiY4S4YiJgu1xDKjvRjd802Gcn74n7R+dBzbCoOuamEIJJmkFLbE+2D56jYxeEh3s6C0bCkCy1AGuemTWU72EJ1D4KFF/5yc+WomKv82ZDnZveDV699839dsZOuHo41ygFqLl5OBwXgSKAURrAIQRkWryqU28SFIckv17EiMZqN9ohX9BTGAbSfrVVB7eHDWs81LOMoRvih1VhanK4S+qRFEHORE3Qkzp27pjf38XdiEsIjmKHVteZ0jPiGt/xdEdQFrZ9Dh7qQkdB22YR1ixyoYLVeX32mydpCemGxXkbuqN/u/oZ7BhdhymxCnotlY9IoWr70GyE3NQJIwdKSZNd9/IwSsNooLKbPuDGzWgjk1xeXgqs2E2m9B3N8KE3czdwKf844A5ufEr0dLR8q0U+jkBxl079piIojEEC7svLwbpek7beOLPQUZYqPpnuRmO75MA 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: Fix the comments for swap_read_folio_zeromap(). Suggested-by: Yosry Ahmed Signed-off-by: Nhat Pham --- mm/page_io.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 48ed1e810392..30ec132c801b 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -521,9 +521,8 @@ static void sio_read_complete(struct kiocb *iocb, long ret) * * -ENOENT: the folio is entirely not zeromapped. The folio remains locked. * - * -EINVAL: some of the subpages in the folio are zeromaped, but not all of - * them. This is an error because we don't currently support a large folio - * that is partially in the zeromap. The folio is unlocked, but NOT marked + * -EINVAL: The folio is partially in the zeromap, which is not + * currently supported. The folio is unlocked, but NOT marked * up-to-date, so that an IO error is emitted (e.g. do_swap_page() will * sigbus). */ @@ -533,11 +532,6 @@ static int swap_read_folio_zeromap(struct folio *folio) struct obj_cgroup *objcg; bool is_zeromap; - /* - * Swapping in a large folio that is partially in the zeromap is not - * currently handled. Return -EINVAL without marking the folio uptodate so - * that an IO error is emitted (e.g. do_swap_page() will sigbus). - */ if (WARN_ON_ONCE(swap_zeromap_batch(folio->swap, nr_pages, &is_zeromap) != nr_pages)) { folio_unlock(folio);