From mboxrd@z Thu Jan 1 00:00:00 1970 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 44A49EB64DC for ; Wed, 28 Jun 2023 17:28:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CF43E8D0002; Wed, 28 Jun 2023 13:28:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C7CD58D0001; Wed, 28 Jun 2023 13:28:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B44EA8D0002; Wed, 28 Jun 2023 13:28:07 -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 A3FD38D0001 for ; Wed, 28 Jun 2023 13:28:07 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 838EC808A8 for ; Wed, 28 Jun 2023 17:28:07 +0000 (UTC) X-FDA: 80952839814.16.F5FFD4F Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by imf11.hostedemail.com (Postfix) with ESMTP id DF4824000A for ; Wed, 28 Jun 2023 17:28:04 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=ZnbhkWth; spf=pass (imf11.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.208.173 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687973285; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=k+2E0Rt8HIW6qnRJgQGPRjPuN/s1eCRBBVkSd2Fo7f8=; b=PPhHLIVuBw5gWb9W6L6s77lGWOZVQ+i6KL62E5xLaP7BxebNvsQKB2zpfhNCe6bj7xKfWt TiOWvOFDnJIpqEVFhDMczNw/OjZ0xpwbiZbJliB1y2xU4HMkc1lGqWsKBYR7w3DyHOXf8M ak+zvVypb86yeOkKEq48EVkSl9vl+Vg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=ZnbhkWth; spf=pass (imf11.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.208.173 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687973285; a=rsa-sha256; cv=none; b=Ui8twXkBBhMl1zf36SF4diqUTxeR+r3wcxN73f4gK5o10GPlYlMAQc5xJyLC62vye1YXCh x4N8Wxpq4z5ojkHN0om2wq6uT7Mu3PZ+2PfrUqp0Khjfp3qzMFLoer7oHm+gCEkvMW1hCU XNVuukIiP8hoRIugNXQzUt+KGXBQglA= Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2b6adef5c22so734371fa.3 for ; Wed, 28 Jun 2023 10:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; t=1687973282; x=1690565282; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=k+2E0Rt8HIW6qnRJgQGPRjPuN/s1eCRBBVkSd2Fo7f8=; b=ZnbhkWthy3eR2jV3Fa0jSGlCcQtNRPTMENE53fJR5/GZ1tUGT3arTsEAnmrZElUuTA hoZmGBf55Q87kt0l2iQkxedGCZL+IPIiuNhVN6vkO345Uht2IpNi+288R8gt+PC2/YZg sioXmIMls+2T/khoT/vOXP/w/19FzH2XWyIGQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687973282; x=1690565282; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=k+2E0Rt8HIW6qnRJgQGPRjPuN/s1eCRBBVkSd2Fo7f8=; b=GlqzWTF/yFPUyUqCpbkuo0oocnNbn2Wj7i7YjLEFQdxcCWzzm1aRafPeXm4+NraL5h z11IZsv3P2cHF82hkA1aiYqDrCYXmUX64A7trqMSVUlo8QQ4ZdynOX167SNyuRiLlsNC 3Kkp3s7kpgnOzZcLTCWedXARK5QY1NZ39mWWdNy88cG25muKHr/Ez6fGhtxZPHksN78q CbrzsrmhK5YSqgojo2RW5cu6jSNr+rkWuCtLdOBYt3/f2p92ss4mYGlRJ2C4DjI7ikqu uznV3CCUwc8kVcvoYGeUSYAZYYWmxiwcb2QhDDNSo75OKyqfHo4ff4CFUXrxJM2jM2Oh EjPg== X-Gm-Message-State: AC+VfDzblR9tl92lmlZId3YLLmQEcFGqOTYjdURb7e8gMLkBo2TBxUOc jlrDDF3Yc3rWAU7L9B1yd2Lm6H8BUxQVgyxpEspNxByd X-Google-Smtp-Source: ACHHUZ40Ltj5npt9/9JoRE1zVLFjZcLDKChLqVeS7nR9QoJFt2T/wPkYOvVaWmF86uv6TwklBipdYw== X-Received: by 2002:ac2:58d2:0:b0:4fb:94fd:6465 with SMTP id u18-20020ac258d2000000b004fb94fd6465mr1434600lfo.15.1687973282333; Wed, 28 Jun 2023 10:28:02 -0700 (PDT) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com. [209.85.208.51]) by smtp.gmail.com with ESMTPSA id c11-20020aa7c74b000000b0051d96edccc7sm3571025eds.46.2023.06.28.10.28.01 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 28 Jun 2023 10:28:01 -0700 (PDT) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-51d9865b7bdso4118800a12.1 for ; Wed, 28 Jun 2023 10:28:01 -0700 (PDT) X-Received: by 2002:a05:6402:505:b0:51d:a24b:3d74 with SMTP id m5-20020a056402050500b0051da24b3d74mr6867136edv.20.1687973281251; Wed, 28 Jun 2023 10:28:01 -0700 (PDT) MIME-Version: 1.0 References: <20230626085035.e66992e96b4c6d37dad54bd9@linux-foundation.org> In-Reply-To: <20230626085035.e66992e96b4c6d37dad54bd9@linux-foundation.org> From: Linus Torvalds Date: Wed, 28 Jun 2023 10:27:44 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] MM updates for 6.5-rc1 To: Andrew Morton , David Howells , Stephen Rothwell Cc: linux-mm@kvack.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: DF4824000A X-Rspam-User: X-Stat-Signature: 1takz31fcbmmj5xdutpprm4iidhs9w6j X-Rspamd-Server: rspam01 X-HE-Tag: 1687973284-590013 X-HE-Meta: U2FsdGVkX18f+SmW/CPlh9Q/CWtDpYy2+77pRJkIsCZZH9vhHDBWwbSVftVN3xmHbVJupHJPYOsGyLGoQkTHy2MRXp+/aLtfzxvPuQ6feAuH0YU4szhwVLZyEIihNLZ2WoDMLO28bc9nXMK22t7eGW6Gvr9F9RPwtHqo/TBgtXszuFRSEk4ivvgMK9RHJVK/cJfu5027pDUu+QgQhGQBOsgnQLra9VdPjXvlFuVnReHRjfGkmkxuyRFFIPfZ5DFnkZvWj15nsq5I0lO6/wxtUutWOaI4k6i9PTPrdIA1fVoqUCK1bM2+gsQxsjv1VCsNWr6AqWMe8LlBsOo0J6+2I7Vs3a6pmugPVAJ/RDaSxsFfSe6d7kPEGc5dZBFeVsBGtTfImjWRO3jtVk2aDN4PZYRXn6zbPIdwDTHv6gbwnks7gSR9E3pLKq2tDPOmFPF2ubTLIRGLko9OtuOwBTRrWmNqfwj/Uw7ETLFwaAEUH3+ZT6ohdEcW+64ophcqZ7po+GhOIbTEPyx+AtqAomHc/oHzMPQw2sI542s7z70agZdcFPgCszete2u2b7WbkP2mH7fiFUC+VuUu/VXBXNQNwhzBeqijNF2P639XKAuaWSaLcTsMzAHhzvqDF0EAC9IA7swz4gFmy+b1bYRAe9LnuAdBAQvbN5Wh0pXACFu9TevTzDYoNHuJ/fYed2ezHqVw1o8pvN21LB2/Ef+ytBHBGQFBLbmchcnNy9dnnF/KytXUjpspqqQeVWRvV6gj24bwcC2Iu3wg311HOHOqqkTR9+ecZ2PR6X1kNYvBIIfoDInKAmUIrIXKmFGpsFMKs0/iZmgSPrLZpu83ReyDvh5w5cAESl5Gjii/BoUkxnKhPGPevso7WhT5iOL7Nw2IvMvRw9EIrk8sstedSaFe+/jRbYGXY9+uK5mFctmYbWCrFv52m0C2t/ZYdvwpo6V3zCtGhvJjRtxum9FZbP5o9QF Z6aWeRmn dXMqlYTO56dEi7Rc4NAjPFves6w10cxvDP2ZuJyouD11w3yz39iQxaxEKaTax9uBVG9qylK01KYi5HMUSNEqz1dY2RMxCMMBfNWJYPgiYRxuG/IiIC2pR0qHzjJY/NkohQMbEjdhLzHWrrhWk+fAvRcp6RzrT5LJdroQlF+wvPH3EWiIcx6bm4lkWH6bKuIvtxw8+qSaijtKeH7AHhM3TejHNAVU9fAyxgT45OinAYdQd+SiTYiUQJqdoV7IotVH12sm3bZkjGNy0zfeBsl0qNiWCrkziNxu0sD0R5NvDWKopul9mylnjDQwnhonYfB3hwWlkS3d5OVRUKMXM3eDOu2qoPHC69A5guhKf234wcfRiUsCHWN5PT9rXa1I34egnxWHmaPmghm0Kq/TUeig7rRYcJgpHf/GCzvNBl1cPMTehLmIc+bqdy9QCyksS+dz4KnJ1Ib1hwGG0l9VsVlnSSRsJecwrfv3Icld0H3WULNQovh801PwhSJEgaWiq54Vl/UH+yl6f3CVjTFFv042lzNDVg2MWcjexY58KY0aKmhJlUgJJjg/rMmotHXlPtyy3OaDGpxIG8wH/RN6vRVd2jQPyxpMphSUbvQ6hBeNa23fFnoMOKTHmIqigg9fNQw9lLEpaY507SvHD0atl2NFmo0omM57pF2QwznSoZNSwo+5pQ+c= 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: On Mon, 26 Jun 2023 at 08:50, Andrew Morton wrote: > > Linus, please merge the MM updates for the 6.5-rc cycle. > [...] > merge conflict in mm/gup.c, vs block tree: > https://lkml.kernel.org/r/20230616115856.3ce7682c@canb.auug.org.au Hmm. I think this merge resolution in -next is wrong. It now does a common folio = try_get_folio(page, refs); if (flags & FOLL_GET) return folio; for both FOLL_GET and FOLL_PIN, and then *after* that for the FOLL_PIN case it does that /* * Don't take a pin on the zero page - it's not going anywhere * and it is used in a *lot* of places. */ if (is_zero_page(page)) return page_folio(page); but by then it has already done the try_get_folio(). End result: it has already updated refcounts, despite the comment saying not to do that. So I think it needs to match the comment (and the try_grab_page() logic), and just basically if (flags & FOLL_GET) return try_get_folio(page, refs); if (is_zero_page(page)) return page_folio(page); folio = try_get_folio(page, refs); if (!folio) return NULL; instead. That's what my resolution is going to do, but let's add others to the participants list just in case somebody goes "No, Linus, the reason -next does that is XYZ"... Linus