From nobody Thu May 7 17:47:18 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8CE8C433EF for ; Sun, 22 May 2022 02:53:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236883AbiEVCxM (ORCPT ); Sat, 21 May 2022 22:53:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230406AbiEVCxK (ORCPT ); Sat, 21 May 2022 22:53:10 -0400 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 146F63F308 for ; Sat, 21 May 2022 19:53:08 -0700 (PDT) Received: by mail-ot1-x331.google.com with SMTP id s23-20020a9d7597000000b0060ae566f9a1so5350196otk.1 for ; Sat, 21 May 2022 19:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:mime-version; bh=v1DAiFT2xmj9A/ks1haZtydUQ187WcFyouSbatKulP8=; b=d3eGHwfEmP1AiPm26xG/Rv8vyfZDXL8vNOK8N7oRyC60AcCO/0LmcAWsGMGKEiWVoE RPdu2qCj8qkfrnfPC5DWsFSK2hNczcMiEqv2gwENlDhlc78IfgxBVkR9xcm2CrVHpQCx KmRc7AYe8E5I2NG4Ozdl1s9A6J+d8X/jOv15oLYHPW4k+3SfakJcLvSU8/cSf0DebH8C 9ZtT7p9mH3y6IZ9BLa+p+cLmrG5tuhXY9X2D0+dQ6RnaBPOcA8Rwmhhn7/Jbx6mLwAQb ND8Pk7QjfX/atfPFwc6XrB1YD9r1y23LZVZmVFjp7K+6/pcRZCM4DasyX/CjHC4yPGj4 MB4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version; bh=v1DAiFT2xmj9A/ks1haZtydUQ187WcFyouSbatKulP8=; b=UIAeXwjWOvHRhY/RkhojFwCkMVZKu4I0MyqSZJqvApVx+ArHqMvE/f/0sa9HPIrcUJ k23uJ4efpSU045nXMR+9tg8gqZcIK/rX89D0BkBT2qhmZj3Mx2i2etE0JLb+YwkkZ89m mpTmQMqLWC5m+yv+xlYtBTKe/Z/2hDzn358kLsl/0jnBvX3R7xeHpFWakvRuwkck/aDS 77OH+qhjE7CKtUC7Gpxrh4QVoJXizs+GhBrbPcPaPlUEjt4VvFzUkGRxeFl8PfMXnwXK NfOuqyAnqc2K4n7VrQr8KwbJzYCmnCIzMLnPyAgw33fJn+2ISWAunQkSzV6REbDNnehm +LYA== X-Gm-Message-State: AOAM531LPirxIg5xi57d3GyZrttTeCEu9DXZ2ZGCtLfpaTMVYXXb7X+s xUpfJadoFEiIMseQsTUZDOTPZRcQzDKYsw== X-Google-Smtp-Source: ABdhPJy5KpGuqJaBa7R3JvaH0mDzSSHBpqtD43dtdjVjYzW9/w8dZRgHoFiwkPsy3qXUv/nF55utvg== X-Received: by 2002:a9d:6f89:0:b0:606:c2ec:66e0 with SMTP id h9-20020a9d6f89000000b00606c2ec66e0mr6445332otq.36.1653187987247; Sat, 21 May 2022 19:53:07 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id v23-20020a9d5a17000000b0060603221268sm2696581oth.56.2022.05.21.19.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 May 2022 19:53:06 -0700 (PDT) Date: Sat, 21 May 2022 19:53:04 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.anvils To: Matthew Wilcox cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH next] mm/shmem: fix shmem folio swapoff hang Message-ID: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Shmem swapoff makes no progress: the index to indices is not incremented. But "ret" is no longer a return value, so use folio_batch_count() instead. Fixes: da08e9b79323 ("mm/shmem: convert shmem_swapin_page() to shmem_swapin= _folio()") Signed-off-by: Hugh Dickins Reviewed-by: Miaohe Lin Tested-by: Miaohe Lin --- mm/shmem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1171,7 +1171,6 @@ static int shmem_find_swap_entries(struc XA_STATE(xas, &mapping->i_pages, start); struct folio *folio; swp_entry_t entry; - unsigned int ret =3D 0; =20 rcu_read_lock(); xas_for_each(&xas, folio, ULONG_MAX) { @@ -1189,7 +1188,7 @@ static int shmem_find_swap_entries(struc if (swp_type(entry) !=3D type) continue; =20 - indices[ret] =3D xas.xa_index; + indices[folio_batch_count(fbatch)] =3D xas.xa_index; if (!folio_batch_add(fbatch, folio)) break;