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 2363DC369D5 for ; Fri, 25 Apr 2025 08:17:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C5CA6B000E; Fri, 25 Apr 2025 04:17:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 650CA6B0010; Fri, 25 Apr 2025 04:17:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A31C6B0011; Fri, 25 Apr 2025 04:17:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 273026B000E for ; Fri, 25 Apr 2025 04:17:27 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1D16B120308 for ; Fri, 25 Apr 2025 08:17:28 +0000 (UTC) X-FDA: 83371861776.09.4C8468D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf26.hostedemail.com (Postfix) with ESMTP id E8570140008 for ; Fri, 25 Apr 2025 08:17:25 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZrKMssMv; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745569046; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nRatMFVJgZO6lv6AeD3PmgD6qQLhfd2cdxeF01R18V8=; b=OZpMK9IsT7i6wzZArJpFXI86q9w50CyWLLQAPFGxwoZRXh9BP8gWTCMWwSQ62MrS3vdbRx aDFDBrc1eqkruZNy/u3Why71oQFe8q787SHCkWp2Dl5L5d7aehNcU3d34MG7xkRTsQbMhM Zb4S+FzQ80nnj6QCGIXoG+9kZJ268lI= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZrKMssMv; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745569046; a=rsa-sha256; cv=none; b=OCZSmZIz3RMn/+DxALABpvU65obxFy73mBu1mynpiH/kTx8ldfSzZ6Ut7H0oKtIE7iUDjE gKxF2n38113n5L5asivdAI55TKmRVDd4/wyihON1ZAc1rCsWY2t5joxIFfGXpPEopvwM+W OXVypSgBJbhZUDTXHgpSqhrA5HdtAYU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745569045; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nRatMFVJgZO6lv6AeD3PmgD6qQLhfd2cdxeF01R18V8=; b=ZrKMssMvJjRxwqfO67jlPx7DyfRzLzCTPXQXJ/aubxlnlAS/tZhaDcy6POoxGlyOm9dMef 5MKacAUL4bxbbbOLTlAAmWwt/trKWTYUD9Y9d9iainRaTeVnPApS1EL+ckAjXl9rRTWh1a 6zahJZmSFMOk3y15BDF8UapS2Swml0E= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-oaHI90wEMGWiCGdBpDevuA-1; Fri, 25 Apr 2025 04:17:21 -0400 X-MC-Unique: oaHI90wEMGWiCGdBpDevuA-1 X-Mimecast-MFC-AGG-ID: oaHI90wEMGWiCGdBpDevuA_1745569041 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43d01024089so13455795e9.1 for ; Fri, 25 Apr 2025 01:17:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745569041; x=1746173841; 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=nRatMFVJgZO6lv6AeD3PmgD6qQLhfd2cdxeF01R18V8=; b=ITfSOnzIqH6z4E1UPZH4PFO1//OroR4CY533v6IHtYVLPfNi7U3XWmZsNlxDqrQVsJ qZ9EQ4TEeQM3Fd8DAU59yO3SsqON3lLHujwNa89TgB0Bx+6JUkfWfNOn0Tftxop8L93f TUYPyShPltjFqx2ccMPFK7ST4KKDF3IWyO4MeH5qrs5JF52ktUDgA0S/YEGe6l0BEz4W Ztajjfu2DP6i9MSoXv3Fxal7w5fDklCA7nsZvE/vukeQwDjSRcbX4chZ1HfSH9jK5+uW vRRJs03apqLFUkGRoNT/qQpg6yWGJCmocqh1DV1O7HgZrbg/GpNujtezJv+yCthX4Zry PwAw== X-Gm-Message-State: AOJu0Yxaj1TYsJDbiKE9hmBXrAAfeNjqtyp+sLjXTgEvGUtE4MD9w/pb G6foLp/O3bCgm2lrw8o49tHmQ4PSZBo/fofIgsPoOLefB3MP7irZpCT5p04ac71uti2+JXpRtWz QDWCRAAWmbvGTl1MDEiPOCv08sa5T+qZc/2QBXAPQ4xlC48IgfO1WJ7DM X-Gm-Gg: ASbGnctqPzzLWKykfRRkSmmPSCYy5qu110+gqYHE5IdnasrTdJMItBdJOaAtNIkPBxi tTkjdplDXxH5qw04Uqh8GG9QVeB2mVcWsFyepZH5Cci39FNO+db8odp2A9rYgPwdmnvkCr7s0fI aLcpghVfw/ubdMlFxtIUxCGrnhEnav2/nQY01cUq3ydoqgCF+3xi7pFipuWe7MGZvjjw/+aI1hB ZcdJNBMuh5e4FWjaiUfIw/LA8pXiQwbqo2SrJgeYcVc5NythVJliuaaWoaK/Bi+sEa8g7g2kAl3 KRaCocrzAZAQbPC5wLsYNWn37/XEhNrtFE5iPQWL3Gc2Udbr7eBREHMzJc5EMGLfFVzrIHk= X-Received: by 2002:a05:600c:a012:b0:43c:f87c:24ce with SMTP id 5b1f17b1804b1-440a669d8f0mr10327095e9.21.1745569040767; Fri, 25 Apr 2025 01:17:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFVinoHYuKj/8cUgxoKVvs8H4zVeT82NWUNjJq9UBXeWLT5FdTynwvFlGCuxwFT/AVFDXEE8Q== X-Received: by 2002:a05:600c:a012:b0:43c:f87c:24ce with SMTP id 5b1f17b1804b1-440a669d8f0mr10326755e9.21.1745569040316; Fri, 25 Apr 2025 01:17:20 -0700 (PDT) Received: from localhost (p200300cbc70f69006c5680f80c146d2a.dip0.t-ipconnect.de. [2003:cb:c70f:6900:6c56:80f8:c14:6d2a]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a073cbedc4sm1583000f8f.47.2025.04.25.01.17.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Apr 2025 01:17:19 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, x86@kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-trace-kernel@vger.kernel.org, David Hildenbrand , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Simona Vetter , Andrew Morton , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Pedro Falcato , Peter Xu Subject: [PATCH v1 01/11] x86/mm/pat: factor out setting cachemode into pgprot_set_cachemode() Date: Fri, 25 Apr 2025 10:17:05 +0200 Message-ID: <20250425081715.1341199-2-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425081715.1341199-1-david@redhat.com> References: <20250425081715.1341199-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 5UzKzq15C5fG9ngvkShskSVuMVt6_5gsur7L-4iGc2E_1745569041 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: ugi8ykdygtmzwsyusr9qncr6i1n9sk1q X-Rspamd-Queue-Id: E8570140008 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1745569045-265437 X-HE-Meta: U2FsdGVkX1/VZR7yNA09hYnpkFtg85oFIBoIWTW9XygQKwF6iclIqxd7c/T+6/ksrMQN6OgWVS1RfiAFK/o4T95qLlR/C1lGAM/ifo7HvnUUNdbGW6KNPDrBXR5R9WiSAVDsqfsWeV99n+z6P0KHKofBOLU+jSImBCc4JoYMypB3SHxuac10OEvi0KbuR3DH2jMluJ45c5W3+yMnoenWEhNXCQkmwA757Z2JcdW8SIvBwqs9Q+fr5jyIlEjW5vNxWuvSsa/jkhACiOaTiQeVVK9yWgXHbJ443fABKBfgGGa1z2o+nRPLgXQvebBWcGCYCkM0SgAqSGh3nMvzU0hEBJML19HLzbUEL+9qPALkbJgZeejaFgtT9M8QU0IdluyEyBw9Ln9DEAMkHqYW6NAqfGhRWLeSEA2dI+w1KXG4MqNOLOombEIai3WvTnVJ383IWtL/B+WBxKg13LvKKSm0hXtOPllycRoXcHJ4/i0XxEnXSrAX3HHyoqGN8lNcHiGo2cGzTXelJdFexeQf6XA6zQC2WOqk98bXdIxPRbRzGQK8vq+gwc+9fGAyz4zQIc6H+GzQGkgsQdoAFrd6zHaQQZ+PjbBdEyMIMzsLXGTQ0PkCzNfXA/scBnRa4cKtUpAMOMhMZPXus1ZGIe56buXNiRBOW7f1GJbpoDyxs8zuW2Im1fC3jUmklrKjV4Xc/Mgye/5PUWMGDTKlnzeO82VSJH5Lx9Tsnoe8qn2GxCXbdQlUI+aLu1/fDoP/f3MWAw5rLhtwEwy3kHbkyp+6r0CVnCPSS7xxxQqMF7PXQz7lqq31CcrZ2eqFW9muzsCwosZBkdXVPPkfckkum4eVavUxgK1KpNgtrAwHqVgXHVzftjHWKdEBTieuwI72+VbCR4fkNHU1GbAPgo+4hhMgeJVfWIrMnivUKXwQk4YW8ymIafegsrlvDEA2K78Ha2C58aB8HoRKjkQS2JG8CUhQRtk 3MACLpnr M7r7lR4wL+r/CfccKI26JZcjONSE7zyZxAqTxLvu9VesIFLJ/uK8QaeNc9UGs7UTj/0mBnw3ZGhkBUtOTf9F2/CITzrMgXcRH6FEV9L/zdKoouWKxh/I2uwAPret9xf+vLAF6BHfz5y5ZZ3ohpfYIAZpmPjS2X46xd6nQ8dSrKDRpk91yebi6q4VZSfB2Y12CTNtJxKKoiYTBQaPBz20A6VnfQnWgrlRfIkX2guGBT3kX+obOiFEqZ9gQgknGVMvkN7L1VcIqovFLJRhr6mYcNy8fg8f1EyFD5jG7sEp8FrrTVEDBNMa9VzZAz7/Qx2g4iAjTU6pcLnB+dromeFD6cI6+8v8DukO+vJdQNYp4V1mq1FaKWTMgx+L2cTKjeXYF+5ZBZWcZb0OqFREjfdykwUwScGNOTmdGYAce7glNUjRHEWuZkt3W3CCvGhQoyGQ1utavOQNO6nXXBK9vMklZv3oycOwgX2KVKrhilkxb3XJRhTgA3RK4pzJj+Yj3mso6/RgzXDXIlXJUw+0XBxNHS8o7pUpYR67Uw6UE 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: Let's factor it out to make the code easier to grasp. Use it also in pgprot_writecombine()/pgprot_writethrough() where clearing the old cachemode might not be required, but given that we are already doing a function call, no need to care about this micro-optimization. Signed-off-by: David Hildenbrand --- arch/x86/mm/pat/memtype.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index 72d8cbc611583..edec5859651d6 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -800,6 +800,12 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size) } #endif /* CONFIG_STRICT_DEVMEM */ +static inline void pgprot_set_cachemode(pgprot_t *prot, enum page_cache_mode pcm) +{ + *prot = __pgprot((pgprot_val(*prot) & ~_PAGE_CACHE_MASK) | + cachemode2protval(pcm)); +} + int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, unsigned long size, pgprot_t *vma_prot) { @@ -811,8 +817,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, if (file->f_flags & O_DSYNC) pcm = _PAGE_CACHE_MODE_UC_MINUS; - *vma_prot = __pgprot((pgprot_val(*vma_prot) & ~_PAGE_CACHE_MASK) | - cachemode2protval(pcm)); + pgprot_set_cachemode(vma_prot, pcm); return 1; } @@ -880,9 +885,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, (unsigned long long)paddr, (unsigned long long)(paddr + size - 1), cattr_name(pcm)); - *vma_prot = __pgprot((pgprot_val(*vma_prot) & - (~_PAGE_CACHE_MASK)) | - cachemode2protval(pcm)); + pgprot_set_cachemode(vma_prot, pcm); } return 0; } @@ -907,9 +910,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, * We allow returning different type than the one requested in * non strict case. */ - *vma_prot = __pgprot((pgprot_val(*vma_prot) & - (~_PAGE_CACHE_MASK)) | - cachemode2protval(pcm)); + pgprot_set_cachemode(vma_prot, pcm); } if (memtype_kernel_map_sync(paddr, size, pcm) < 0) { @@ -1060,9 +1061,7 @@ int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, return -EINVAL; } - *prot = __pgprot((pgprot_val(*prot) & (~_PAGE_CACHE_MASK)) | - cachemode2protval(pcm)); - + pgprot_set_cachemode(prot, pcm); return 0; } @@ -1073,10 +1072,8 @@ void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, pfn_t pfn) if (!pat_enabled()) return; - /* Set prot based on lookup */ pcm = lookup_memtype(pfn_t_to_phys(pfn)); - *prot = __pgprot((pgprot_val(*prot) & (~_PAGE_CACHE_MASK)) | - cachemode2protval(pcm)); + pgprot_set_cachemode(prot, pcm); } /* @@ -1115,15 +1112,15 @@ void untrack_pfn_clear(struct vm_area_struct *vma) pgprot_t pgprot_writecombine(pgprot_t prot) { - return __pgprot(pgprot_val(prot) | - cachemode2protval(_PAGE_CACHE_MODE_WC)); + pgprot_set_cachemode(&prot, _PAGE_CACHE_MODE_WC); + return prot; } EXPORT_SYMBOL_GPL(pgprot_writecombine); pgprot_t pgprot_writethrough(pgprot_t prot) { - return __pgprot(pgprot_val(prot) | - cachemode2protval(_PAGE_CACHE_MODE_WT)); + pgprot_set_cachemode(&prot, _PAGE_CACHE_MODE_WT); + return prot; } EXPORT_SYMBOL_GPL(pgprot_writethrough); -- 2.49.0