From patchwork Wed Apr 16 20:24:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 14054450 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 BDCBDC369C9 for ; Wed, 16 Apr 2025 20:24:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 912F728013F; Wed, 16 Apr 2025 16:24:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C1D028013E; Wed, 16 Apr 2025 16:24:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7899F28013F; Wed, 16 Apr 2025 16:24:52 -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 4ADBD28013E for ; Wed, 16 Apr 2025 16:24:52 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 63D0C140BD1 for ; Wed, 16 Apr 2025 20:24:53 +0000 (UTC) X-FDA: 83341035666.01.8871711 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id BBBF48000B for ; Wed, 16 Apr 2025 20:24:51 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RhMOI4Eo; spf=pass (imf02.hostedemail.com: domain of alex.williamson@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=alex.williamson@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744835091; 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:references:dkim-signature; bh=ju14Dd13F13ROmOuZTdiY+l+wLgVYj/IyRazcIBWaZc=; b=QwWHdY0phA9EyTXLDz/nkMnIeF8OR1mOOnAuOJGRBBCVySexXb9bLdDuKVMxAja9D++tPh gogCifG7rtz4F8Cf5plq3WoIHfmfDqqb3l9DOMm8ss3R1MZk/2SmERY0t/HwUH2hPz9v+x zKYdSNUmk+O8co4ikO/OC3hR/C86JsE= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RhMOI4Eo; spf=pass (imf02.hostedemail.com: domain of alex.williamson@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=alex.williamson@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744835091; a=rsa-sha256; cv=none; b=7fnxQsNEuQdurKQmh0nbUJFGkUiwWYSTe7fbFoyYo182Sai6cEhPhgUPU0CuRU9EOTefFm B7Qrf68wOXuysS/Kj9lmoNZQHAugqHeFk0CKLyTEUZw+iLixmGM+4sKKLeXrv3sdMONwCN e+ZZBWmIzM7+aZnXQN1dl/VyrD5D6hw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744835091; 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; bh=ju14Dd13F13ROmOuZTdiY+l+wLgVYj/IyRazcIBWaZc=; b=RhMOI4EoBZRIHkBWp1RRjBbZnocbG0yJa/g+woEgXOnvo+qtMoDnkGpIAfO0Ct4eO3SMCj XGqIMFTWW6HxI6Noa2V/eSZWbumabspryikLlCbwsKEz02xZmDL/HGAUouUU4OijD1SE4s 6DPzQTUlD2IiRJbQcUEcyzheTROtXF0= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-424-_emr5mBXOv-MMGo6lEAlDg-1; Wed, 16 Apr 2025 16:24:48 -0400 X-MC-Unique: _emr5mBXOv-MMGo6lEAlDg-1 X-Mimecast-MFC-AGG-ID: _emr5mBXOv-MMGo6lEAlDg_1744835086 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A0BC11955DCE; Wed, 16 Apr 2025 20:24:46 +0000 (UTC) Received: from omen.home.shazbot.org (unknown [10.22.88.22]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F3D6D1800965; Wed, 16 Apr 2025 20:24:44 +0000 (UTC) From: Alex Williamson To: Cc: Alex Williamson , Salvatore Bonaccorso , Milan Broz , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sasha Levin Subject: [PATCH stable 6.1] mm: Fix is_zero_page() usage in try_grab_page() Date: Wed, 16 Apr 2025 14:24:39 -0600 Message-ID: <20250416202441.3911142-1-alex.williamson@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Stat-Signature: 9icoi91km58ypc4za13csidz373c1tj8 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: BBBF48000B X-Rspam-User: X-HE-Tag: 1744835091-237572 X-HE-Meta: U2FsdGVkX1/TClDS4tJjHePtk97cfR7DMkM5v8UhM9Kk2HFY9pYRJpO5x1byQbqChhOBIF9EwNphIEGnqq9F/ZWHpfVHoFXVHIwu25MhQfgtfh5VIba0dCs+xHfKoprAi65CHKX0ZXY8EwsDkMiiElhl5ZEQqYBWn0huNoiULIPdryFtqLbmrXOjY100f2wrObBs766p+6zjPRqEulwuf6658IDYKTkT3I342cUjSf5nY9qVIRsgLs2BkbcCJeAKeSdOBkNZ7AN90QxyDPyXYG/bTpazE42b104MSLN8oAeTq5zc/xhwxo9dqGRy9YoYD3cn30qZ72OSvGs4rFsgQLK83MqsO8BwS8vfpQcQuP4PtG2iKgWb7hzyxqhdwPF4R7xYXOHeL6v+TrBVa6w/Y0vsLMjTkQOxC0jKah3coEv1Yxy+oWu0dgL1Mu1Dd0l42ETfpWZnZdTOdVniQTLiygCNznmqaWhoQrNb12qFFCbcT0G5bu9+ea/XUPSngVxGfbntwm4Rf/u4r6kw8ZQoMA6s0Q+/Aj5kMwDrmb/bym0n+GowOHLOkNxY8KpTtWar7pDq2FEf+9E186YT4s44jEFoPabQY8LZ8Lj1ehb/hj3+GfKvY+PZ8p+s1avEe4G/NTWHBkxm4NN0c9AvxVLUEfyCSTlbOIiReMRecyR1bhonGTeVfW/T6fPwhPC4UwBg7bZkdP4tVQaM20WMJs9uG88Y2c6XriZ10hGQgqO3fpknBlkVlE58fPOo2R8O8RYNgmq6t18uUGKw9fl41FyxDnaNGE9RdaUhy89p1vqOvk1EJimWt6mUbzhEuYmXXtcxZYS31TbD3nPC3IGauBIggdwHvCVWVKvcIL0iAZ5NNu08HlgKEElp6uciJw63zUsLL1kBLQP/tdZaLM9leATVNk/1rN8olgL66OCeCco4q/5WJ0fIfvjOj5mriK9lJUiseIzJ1Fm8ZsJKHFJUr3m ftWksADO yK3IY6uE7dBiyPQ/np5wByLZnvfF2AkpZ42Eo0TfTWtglYEErcf/DqpXE4OMBMDh9eiAiBk78U2JRe37/L6i+aXxiULD67dVwSB5TNR48bTv0QxN4ARdfnh/KD5qe4YL5y/iQU4dyEJnZ3QqqYMjfYYdC9PEoyt5noMMRFOEJZ/QTDf0QL5jtDze97MCFem8wjhXX+iGT9+NYn+62ReY7CUexG7sxMDswOKQK9Em6Rx0sBivlH1kCIpuM1k9CsbUOcP5xz36Hq2wNYhTJrdACJwM1isUhPndP/vj5w/leVakGiXqCTNRnk873BzidkxMJtu9SY1uYW0UwxNoClTg22EfSizdOWHqjj4ue+pG+5HaInbREzTuXNPJgB9PhrL58itR/H1w24l7JS5vNlcjkB/SzkYi3IN4FTyyehMpuaC7WaeCYKaxDGd0oAjoSuj1i/4zKBcZXKkbNzSRKM8RDE5mqp9qshXpm81fSphojFqqq1q3SfQpCEBK9Pn/ScqSC38d3 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: The backport of upstream commit c8070b787519 ("mm: Don't pin ZERO_PAGE in pin_user_pages()") into v6.1.130 noted below in Fixes does not account for commit 0f0892356fa1 ("mm: allow multiple error returns in try_grab_page()"), which changed the return value of try_grab_page() from bool to int. Therefore returning 0, success in the upstream version, becomes an error here. Fix the return value. Fixes: 476c1dfefab8 ("mm: Don't pin ZERO_PAGE in pin_user_pages()") Link: https://lore.kernel.org/all/Z_6uhLQjJ7SSzI13@eldamar.lan Reported-by: Salvatore Bonaccorso Reported-by: Milan Broz Cc: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Cc: Sasha Levin Signed-off-by: Alex Williamson Tested-by: Salvatore Bonaccorso Reviewed-by: David Hildenbrand --- mm/gup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/gup.c b/mm/gup.c index b1daaa9d89aa..76a2b0943e2d 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -232,7 +232,7 @@ bool __must_check try_grab_page(struct page *page, unsigned int flags) * and it is used in a *lot* of places. */ if (is_zero_page(page)) - return 0; + return true; /* * Similar to try_grab_folio(): be sure to *also*