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 3C09AC54E58 for ; Mon, 25 Mar 2024 10:28:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BA5256B008A; Mon, 25 Mar 2024 06:28:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B553C6B008C; Mon, 25 Mar 2024 06:28:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1D3B6B0092; Mon, 25 Mar 2024 06:28:24 -0400 (EDT) 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 93A5A6B008A for ; Mon, 25 Mar 2024 06:28:24 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id CBEF680B9F for ; Mon, 25 Mar 2024 10:28:23 +0000 (UTC) X-FDA: 81935186886.13.102CB21 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by imf29.hostedemail.com (Postfix) with ESMTP id D84B612001F for ; Mon, 25 Mar 2024 10:28:21 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=B+EJsZtJ; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=pass (imf29.hostedemail.com: domain of mingo.kernel.org@gmail.com designates 209.85.218.47 as permitted sender) smtp.mailfrom=mingo.kernel.org@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711362502; h=from:from:sender: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=QhNP+Ohm+wuPdkK3iipOkEXGTK7dlATNMGDUaaUcj5M=; b=H8W1uVT8fGloY2LY72VeoAG4AsZ6kH9i7csHB853/uDrDxRO9vy+yYv9FubQvvm+qFcq7y Pav04QocB2CGp8RXf2udWOrp3SCVQ7YLMtZeUax45tFBwzbRzn44WY8l1bEk98FEysnXlc +HQlGkDwtBwfxJEn8DoZbm/9fp1fYi4= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=B+EJsZtJ; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=pass (imf29.hostedemail.com: domain of mingo.kernel.org@gmail.com designates 209.85.218.47 as permitted sender) smtp.mailfrom=mingo.kernel.org@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711362502; a=rsa-sha256; cv=none; b=sZmvr+ewJ8NlPnwyl4pQlE+JH+Csk5vqITfLiZQzlIijQps37MZMgRkHbNNovAz15kWmwm vsI/bfwxN8mVwBpMzplFdSqV6bMZlRd5hMwAMbfo2C8u3vwseCDoGmJjfIEdbrxr7z0i/1 MM9+rR8fsVAYzizuGw3w592zUUqxln0= Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-a4715991c32so489331066b.1 for ; Mon, 25 Mar 2024 03:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711362500; x=1711967300; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=QhNP+Ohm+wuPdkK3iipOkEXGTK7dlATNMGDUaaUcj5M=; b=B+EJsZtJ56iRT9m3Gw1m3oAFlLFXtoHwcpb8zC38r4YGR7fjwDOTlDIF68na4hT3iV +/lbuFPZgcDH9THHb6pQ6EcXjEYhTxgSbYjcnOdci5qy+IqCs4dhld7yanldvUbB0AnA 7/qokeh3jbh+ZZLSSHhUE3j8hl4chmuUO3QuZferUo+xgZ5XRcQdN3OuOSBMDNguV/8s n1T8M6SALdLhEp474jXnbyiYdHWRnQPpPcazR1DaqrHZFniChoga9ybTZnokbjk6U92D OmfujaleUgZU9ZWSD8FSp6uFnVegwk2lZ3cmd8R/rC1aKID5R9ohLrQlXWyRxZ9BCprJ XwAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711362500; x=1711967300; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QhNP+Ohm+wuPdkK3iipOkEXGTK7dlATNMGDUaaUcj5M=; b=Ao3oIMMkpniTcfn6QZKulYUAQNcKc2ShsYIkucZrTqQbBNF+BG5ycGMNH8ttz7ggGJ w0Ahfd9lvV34jJpUaQ/V1Cs6JUXCnhb5j+wPQlHIBLmCYrHuYL0TjbW8ckoLIynU76wG Gha0LW3VBLq+Q7f00EX2xAfrHWgdu0FEJsWo5eVhceNhHuh9bpNMAEyEOScjl2hLW03U lwkMUPCm49fUT+hLisZ/F3tYUGHnRr+1Kr0OuTDu+OhlZfCznY3pnQiduaXrZKqwGnFu lXXdRRXFflFTZSZrt/DIZFMbbQDytIwNysk7aiM9Zni5J95lWKyq6ooOjcMSRox/UzT5 l5lA== X-Forwarded-Encrypted: i=1; AJvYcCX60Zd+GyvC6nk84+S4c0JSJzOKGib8PWCfoz0As/jH1O6kYL30BtoakAZjXxWHhG1Tz97noPNutmVAAztHwlHC1h4= X-Gm-Message-State: AOJu0YwrK82WQqwwi7kwbfixZPxgWq3m9ih8sICgxWlndbnOOj8jPstk smKCDj340NVETfcfYSB+ML7oxA3Kve4QOSpZDX7QZftQ6ZIr69jp X-Google-Smtp-Source: AGHT+IFTMTpmGaLeoYx8dI+rKImvZW4FipPUHEhXC9mwwL9h+YJX6e8IpQrYKz3hki03JeivIH+WgQ== X-Received: by 2002:a17:906:c109:b0:a47:61cc:2b7 with SMTP id do9-20020a170906c10900b00a4761cc02b7mr2533865ejc.10.1711362499743; Mon, 25 Mar 2024 03:28:19 -0700 (PDT) Received: from gmail.com (1F2EF63C.nat.pool.telekom.hu. [31.46.246.60]) by smtp.gmail.com with ESMTPSA id b4-20020a170906708400b00a46da83f7fdsm2912521ejk.145.2024.03.25.03.28.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 03:28:19 -0700 (PDT) Date: Mon, 25 Mar 2024 11:28:17 +0100 From: Ingo Molnar To: Christoph Hellwig Cc: Andrew Morton , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Fei Li , x86@kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 3/3] mm: move follow_phys to arch/x86/mm/pat/memtype.c Message-ID: References: <20240324234542.2038726-1-hch@lst.de> <20240324234542.2038726-4-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240324234542.2038726-4-hch@lst.de> X-Rspamd-Queue-Id: D84B612001F X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: osi3fadyrrogchti9b1bqa8bh11msgfi X-HE-Tag: 1711362501-780295 X-HE-Meta: U2FsdGVkX1+tPmL1uqp8FdGN3l93YCDWwIrpcnUfEV6jxyGfSg+C2r/OCALViDT9vbgPjckg4il1F7W3If3OmzJGt4QnYp8/WSzpW8WVBsRCpCH1y2NNjxNNks5wI+N5jAyuIeNGreTM8FU9lFRArW+ZV919K5haDX/51pCMptUwdQuEs0sLO1g/Lv82i7WH7sYsTVGF6QGMiVbgsBNhRP/UqwMj6HswUJv0lo8WdZVffwSbx1tduSQuO5X4pKoKindeCMTmNqthj6yow+bBjKGp12mmGiuMWyr8OV1UqcJ5IbRempfzr2fPAk52Ch+Pc3gso1WJSzAsGuzUSWUVY15r2H67E/f8IIfwSbnkO/Bax7uEGlPjUqd87+9yy1g8Sgpx1+q7qY0E2YXmJfMclmWAoOOI/6/8bY2ANGbCZoUT7ZM+KTt2kt5Amfu/A6YR9ix0ckkFz/aNb7utGX+1ZzJqW7Y2VFVUHGX3Bkyldr9o9Ut9fo52u1fXFt8HwKWzd7eb9UXrcbVl7tXltykfOvL/4rNlb9WAvvnJC4SSMEVgSRu3h7/7ZXr693pVOpFzDfTjsMpjTV9qVM+keRnEfJhGddBidasVZP5wwDz8viuYqmaQ5A+5JuAk3BdYj3z+s0vPEXBvLi66EGU2Qt/XBGVLmnb1qNLHR81itwelJpFeqeS9ap5hVZwL3T4FcGXWUt1/A1JH8+INKP0VhKDjbWQl7PPOlK3n8CWXti66QIvcziJAwsIot0nsp4tDewZ5nWMe2pz6s+hierXbbFhdlM7SMduBwa1uH4e6WjEiCDVXBBZOtkhg733A249rtlhliHrtd+eRSa+R5SoqhPflLzt71zp4dAyy5cosBtoUiUAEX1+1rSsNtnTFKavXgzI6cFLIDu74ddNgPVuHO6XxCZOOTTyWAjeoWVJE1g7am6I1Et0tNBOXxXyhcoTreaKvykqsZ6ZujbHowX/V3dN rUkx7cLw OEebQMGtr+DEeRtC4lE42A2ZxIagKRaEx3xEkWL5W7CTnjXbMoYE+Bx+yU8HjspsBPkbh3ILUwLzRCFXsF7tFc+QoDzaGKqhgnU8KR6Rn6QQJ3Osafw3GqhljU+ZauYl36odpNuutUPkzV0q7FYpxHwDADtMvDN/NCgf11NW28aBnBdh33j2jOGoxoXTsrmmteTXLyCCrYFhmluyx+LYkA+b01CReFjGtV8vX3yXZchM6yM1PK03m5Zop+Ie1PSWG64/rrIJ6KCW+TuaCMYRUl86EdwuCpzCXyOkcm/Uvl71qPqaS+lqNirOuEa0bXcIJPocpX5542fQNFhQKTT6gDd4Mct9DBAotuZd/WED6OuPU4qwvOg07DtzCc22kaViuO/tX1Upo618JbDEs/A0OBfG2PHe63ahMqqWxuHlFf3gpgngwREnrEcfN9HmYqPvbZRIbFVmhNO5P2xsp42ieGIHOwmKt4w57KeqMiUtQhNZuWRNNuiyGQHC36l0QhQIt0vc+VlALFoyrHzGXDEPan2zP+FPbb5EHrdT0l0JqbXcmv7Q8JMxEPhfLGw== 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: * Christoph Hellwig wrote: > follow_phys is only used by two allers in arch/x86/mm/pat/memtype.c. > Move it there and hardcode the two arguments that get the same values > passed by both caller. s/aller /caller s/both caller. /both callers. > > Signed-off-by: Christoph Hellwig > --- > arch/x86/mm/pat/memtype.c | 22 ++++++++++++++++++++-- > include/linux/mm.h | 2 -- > mm/memory.c | 28 ---------------------------- > 3 files changed, 20 insertions(+), 32 deletions(-) > > diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c > index 0d72183b5dd028..bad99eb5c95b0d 100644 > --- a/arch/x86/mm/pat/memtype.c > +++ b/arch/x86/mm/pat/memtype.c > @@ -947,6 +947,24 @@ static void free_pfn_range(u64 paddr, unsigned long size) > memtype_free(paddr, paddr + size); > } > > +static int follow_phys(struct vm_area_struct *vma, unsigned long *prot, > + resource_size_t *phys) > +{ > + pte_t *ptep, pte; > + spinlock_t *ptl; > + > + if (!(vma->vm_flags & (VM_IO | VM_PFNMAP))) > + return -EINVAL; > + > + if (follow_pte(vma->vm_mm, vma->vm_start, &ptep, &ptl)) > + return -EINVAL; > + pte = ptep_get(ptep); > + *prot = pgprot_val(pte_pgprot(pte)); > + *phys = (resource_size_t)pte_pfn(pte) << PAGE_SHIFT; > + pte_unmap_unlock(ptep, ptl); > + return 0; > +} Please keep the readability newlines as the original had, ie.: + if (follow_pte(vma->vm_mm, vma->vm_start, &ptep, &ptl)) + return -EINVAL; + + pte = ptep_get(ptep); + *prot = pgprot_val(pte_pgprot(pte)); + *phys = (resource_size_t)pte_pfn(pte) << PAGE_SHIFT; + pte_unmap_unlock(ptep, ptl); + + return 0; Thanks, Ingo