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 CDC0CC3ABCD for ; Mon, 12 May 2025 12:34:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE1D56B00FE; Mon, 12 May 2025 08:34:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A94246B0100; Mon, 12 May 2025 08:34:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 932AC6B0101; Mon, 12 May 2025 08:34:36 -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 75CDB6B00FE for ; Mon, 12 May 2025 08:34:36 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A0B391210F0 for ; Mon, 12 May 2025 12:34:36 +0000 (UTC) X-FDA: 83434199352.28.D0C1CEA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 7981D1C000A for ; Mon, 12 May 2025 12:34:34 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZJq+mvy0; spf=pass (imf20.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@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=1747053274; 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=hrbmXyUL7HXGUWgagRU2heQ2lgkOZ/iJWMnvv1t5buw=; b=Yjo+Bjy8vuEb3EZRhfJFuphjUAGxYT2EgfBqpb1VWksJVsFYpqzksSTdsn7Qt6smlBb023 3ekYAkTlMIikeSrsSTrkYFxo5NRp9/0cDQNAK4d5dF4q4TCkTiaBlm/UP3n7wZ9np5i1X2 fE1UyeUP5DhQq6yz9ae1X5vgfOxxnFc= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZJq+mvy0; spf=pass (imf20.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747053274; a=rsa-sha256; cv=none; b=R9QTYhRjohapWrHGFbg9TN43Tdw314P6uWlYx5TXNOTiBQ+GzfmGDen4QT/8GcFRx7p15G s9AOiMZok5t9da81zZx6qNcNE0CjYv5EysH1pvofWPCQ+JIqR+7PPsxSUnwJrlkUp5SBNy 9Crq5athBepfe6A1fzDlhJB3/8svG4o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747053273; 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=hrbmXyUL7HXGUWgagRU2heQ2lgkOZ/iJWMnvv1t5buw=; b=ZJq+mvy0ZvefcuZmdyp5+Ui0gRr8WkpSKT50kAy38LViqzN3J1US0nIMFE5yBf7hXilS4C s3VP5/PK1/KEG8VtUALrm0QeJ0/fERZUzq8AQ+Pt4p8U1q4TMnjy1J1G4ni+vcMPl+6PPF o7O0p2Frt0qt61wBdyzUV8POw72MAJE= 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-380-Iy_ynLY2NOWBt18AaX2i6w-1; Mon, 12 May 2025 08:34:30 -0400 X-MC-Unique: Iy_ynLY2NOWBt18AaX2i6w-1 X-Mimecast-MFC-AGG-ID: Iy_ynLY2NOWBt18AaX2i6w_1747053269 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43cf44b66f7so24844675e9.1 for ; Mon, 12 May 2025 05:34:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747053269; x=1747658069; 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=hrbmXyUL7HXGUWgagRU2heQ2lgkOZ/iJWMnvv1t5buw=; b=CAUIVCKqQI8LFVx9+K8ig9ZWIImEjUbN/YHCITdcf/ucHyr9+rBVyb7CcFh1d2Rdym 6Go40kNEFK5rAkZiGQkCT6YNEAcJDMRGJQjYG0++R/+JHNnO+pcnnIjWj6qxqxSbbhnw Q/h9sNQB9MBXAcXLswpU860k6gLEelJcuTLd8hE1F4crW1CioQq+C1E5vIIwPdvpnHkR BeOyXRFwWwZRCqHN5wL7usZ1o6yIyhPTlLStty4Gh4Zkki8UpyWq4zCAj+WpxJG999UM 6DJX7lfkudo5VPIvkmetAVFqITUL9bG8JhYNlqjExzJdmZfx9CSQSdpHM457MvuDtTET xezQ== X-Gm-Message-State: AOJu0YzhLyYYxqejf6DzAxioNRo2JQR5UMuXXOApsGXFGG7bAYNXncx6 Wev4GfErNP2zdD9CRASe3opNdkzsRq+xA/dUd7jHZFhKHWARDOoQAuMMKiLylRWtPiVVX7x38/K K1YxDqw87FaSxXnLh47Nx+USvyTa9jF/LXW4UjPQXiEcfboka X-Gm-Gg: ASbGncunS7Vr66rif/RN5l84ibMn2d22rKbYzlggGg8jfv6pKYr+8hqVMsyxtOGjjYY vkSOIYRCM9XdwRIcaX8T4EscFT9Wr80Y4VROGY1KILkpFLGfdu7a0iqLI1crxhAJ2vEuhEKoVyR vJmsALGQLRNSD41OMsHNxYZEa0lPQMz9DwJcr6ps7Frh1+H9gvnR5XpETP7KTjcwpwB8ML5YceF MQGs7EGpKc2zLT+Fjxxk2bLkLMn0OswneGfMBAcLVt2QVJEMxcMjnCL7pd85Rpc2iquYA2qgTV1 w3yyT3UJR8DMLhUXP3Jnw2UA61oX55OlZ0HyYNZkhgdROwlZquh6uwloe+pYSueZO67OwfTx X-Received: by 2002:a05:600c:444c:b0:43d:5ec:b2f4 with SMTP id 5b1f17b1804b1-442d6d3dcc8mr126249835e9.10.1747053269209; Mon, 12 May 2025 05:34:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF7YFyagUZ9y+fevUV3BzP4ffMO+2lnku0MMlhrkvHNYDdbfZ5KLiwSKLyxUHWcSulKlrGmcw== X-Received: by 2002:a05:600c:444c:b0:43d:5ec:b2f4 with SMTP id 5b1f17b1804b1-442d6d3dcc8mr126249585e9.10.1747053268821; Mon, 12 May 2025 05:34:28 -0700 (PDT) Received: from localhost (p200300d82f4a5800f1ae8e20d7f451b0.dip0.t-ipconnect.de. [2003:d8:2f4a:5800:f1ae:8e20:d7f4:51b0]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-442d687adc0sm123327975e9.35.2025.05.12.05.34.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 May 2025 05:34:28 -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 , Ingo Molnar Subject: [PATCH v2 01/11] x86/mm/pat: factor out setting cachemode into pgprot_set_cachemode() Date: Mon, 12 May 2025 14:34:14 +0200 Message-ID: <20250512123424.637989-2-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512123424.637989-1-david@redhat.com> References: <20250512123424.637989-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JQQ1oLYzsXP6ICNNZawCnyWv53S3y2rewAxy_3YLL1s_1747053269 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: 7981D1C000A X-Rspamd-Server: rspam09 X-Stat-Signature: dgmx9p4cc68kg16r1kmgjntykgu7gez9 X-HE-Tag: 1747053274-990181 X-HE-Meta: U2FsdGVkX18Tm2uJiTpJT2fvXn+PdeT3e2xXql/8LCfJnoRt7Qb7f0ifzBsj2J1g7Vi2rleAqKVLvFXOj2pTEzLztynBc2v5q19tydfYaZTGLyNVBWxyElMIyjjoPTGMr3AI2bnxaxkutM0hnz4qRdwHmYBUJNseUoNBbsiSwAyayI3L+5BBLLI0BTBcHG7q8Wk3v8WIvL8kAPknVbfOscVCUbP1JQVNd/jzy5g+zJPN3ZcFWb2p8RpMDrwOKk+vWTlVphpO3hETsePrjWTmJ9hvkPYuNBh9DnGnbwLka+0zQKmYrRNKmxW90Po3rvpAbg0zMpMQf3DFlNHZXKdR5r0V0GChBrUazLbTqV3rW12N1dtHOV/8AwrJ3DDVWOxE93cVVAqHc2GrX3mMdiWxppI1Y0erjOIDw3j2GKTYMhIGRkjETNvu8p6kaIAjkZE3bvT/kKCeVGisZVEENVAt3DTyFNM0KTG7+hdHzKwN+dsLJXxa2PRABekn+UDhCVzInog0Gq/U4paiTV4hy4JESNCMmHDdzFZBbsLaDLmIbJyNp1kvf1kDyYDelMe6DToT/S3Hr7U5x4XTu4sN6+ruyQU024LvlVBhpTyinvyecKV2AYBvx7t4kMhWH6O7SKDYpIfwvubuTrNVNaX35jLeMYmTDum0zjN5jiZ0UIYiBbWxZwFXhUXCj9RkiCk2YrNb8/bFFeq1Q4RJn2LG/Y45iu7U0JDpsd10Hl5Qwe7wiBK5W+uYjOAgGhGP0ZFdbRDX1cryp72puKGklozXStYa0xHQ6KftqzpvlR2251Vn9x47NbqJj12ZVsldZKaM0k85/QSqWyOLWlnTpskMJjxqzj8RlUOreyOVqnPvWpzjIUq7BBCk75ZSJZYC3QVWCXP1euC9a9pa0XSk4piqJoBUEyKRWm/mSX6YTevEaLfFgZjize6lz5aTtlV9Xu6No26jKYqhNzwHpk8VtKFnbk6 s4fjflpD ZkLDv4sUiTzrl0Q9dtzXER4nQgMXX72zHo3UTorQ/OmE23tssH9+k/cTBAA1sRJm4sKnorwGwKwZIIbe+4ICon3T9LlPoj9Z+GxJsyMok6oLd69+/ePayY5f/GkB7Vg9wSOFygv14m2HcsWFU1uaNExXznY5GZ34P2Pk4KYvK+LntFPA1VT9vl/D7VEnNgVHy17bHJJHqtPmm7qRSEfRq/vOPX7ue+r8hDrOnKvOEUTetw7nj4sxygm5NMYuzXBTuhG1D6dcw+Q3nS29INGbb8AVqrVIZMSeawvT3OMP3SfZzYl7VBbwvFjWNkf6BdAAvqZ0eQFSDrbtg3D1gVq9o1laJBPH/rELPeqoQlGUBkN0SKwKBSZ6TkhW4Tf0l4Q6AQ663JOYpwZbqgd6Vz4VVUaZYyUWIASYm1361apl31rVsMWTFO2Ec0VqyNQRowGIxqGKIQC2SIUcx15YtSLDvplJO/swi9Ude0ZiNbbM+TiR4iCDxD+pPupdqLrAXUxGKAwMboTs53NJx6DdDADSO8jUg6FJMWrHzKDS4UGBWEMyC3sQE72ngwpegvfayCyO7Tjc2QJh5mjk9P/yabnFcQpJpacfpkAMi8Zo++fJu/kfNXQxTC/GpUmZsP4DJ9oOnD65De1FWEHahgo5y6KjdRwm4/YjZCDoIAVGLajTX3iBtlovqr3iq1Ef2p7Vf6CxY7N3PEUnP00cYS64= 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. Drop one comment where it is now rather obvious what is happening. 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. Reviewed-by: Lorenzo Stoakes Acked-by: Ingo Molnar # x86 bits 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