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 3483ACD1284 for ; Tue, 2 Apr 2024 09:14:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A32CA6B0098; Tue, 2 Apr 2024 05:14:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BC3F6B0099; Tue, 2 Apr 2024 05:14:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 835716B009A; Tue, 2 Apr 2024 05:14:26 -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 5FB106B0098 for ; Tue, 2 Apr 2024 05:14:26 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D3AA080975 for ; Tue, 2 Apr 2024 09:14:25 +0000 (UTC) X-FDA: 81964030890.27.6B44383 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 79FDE100014 for ; Tue, 2 Apr 2024 09:14:23 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="fblc/Wcl"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712049263; 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=vMXN7V9/uKTl8g/dbmNST+dY+CBeR5GDL9If0/51dXQ=; b=fYrigo5GyXBgBBrHiWkbsHEeTcB/QiIksMEbz1wgudMtX2vXeqaDrdJQEOZF/WKtorURPV kAGw8Ztr8NOKzpJKkxzSn/TZfSeEjNAkdOZTKACz4q4ANkNZ7tLgWk62IbH6Y542HvjSgJ 8QOpOt+vllYnPQ6mZVmVf7F4IN/HawU= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="fblc/Wcl"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712049263; a=rsa-sha256; cv=none; b=HzPCTJTOLywIqsbSXrdi9/zeupY1fs6SOKqr6Lfxa6Y2u/bEiQa6kdE81d40FZY4DReoF9 4XR82tlheZbM5eEUrDa0PJpajH6ChQcoBctKyclhxBBmkjwl5FBH5KJFICK5COXC4Uu/cy AaG0MVGznuMgRvWFq6z/IqxXiX7KgrM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712049262; 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:autocrypt:autocrypt; bh=vMXN7V9/uKTl8g/dbmNST+dY+CBeR5GDL9If0/51dXQ=; b=fblc/WclNs8l8Rgfuubsnt3MKIFEzRgHEQjdo6PE/lmtjvhzjwy2MfyI8tAN6B7iP+8vVb Da+OXVmySIeISzJzJYtiDAWtnxjEj9twYpQAJNeXDcv2S/DGPSNpzwAe7OrcyVSLUuXHu1 rJwU/Pmo6Iy7LcnvCaGTfbpECKBgE68= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-265-Gg1-X1hwN1eNw5m0NEAMIA-1; Tue, 02 Apr 2024 05:14:19 -0400 X-MC-Unique: Gg1-X1hwN1eNw5m0NEAMIA-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4147f17da12so23655785e9.0 for ; Tue, 02 Apr 2024 02:14:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712049258; x=1712654058; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vMXN7V9/uKTl8g/dbmNST+dY+CBeR5GDL9If0/51dXQ=; b=KpJJXKhFO10jTY/VsW3q4sGmgzxrX+aTgGkBkP+611K9k2KhA+TTN9hUSbHXKVwTou CrmdnJDnaWr+OsUkxhP7xUBp9reOtXIr6VdmasYtvxFNrfsedecNcXkhzSZ7EmZnwgs1 4YL0XALO6N2SgtWX8awowsHPJW4rwDEuyFmXxiUhS5hCpdmLmoNGBAA4/wXDaixkKlOT sHsn8jHJPkLHi/gApJeSWP377RnUSzyVcDVWkDykC1awZwACk1j57hc7WJEcIhELGdvU TRbt58D262C1qrVa/z+stmUPA/5+5MzAMdGO5K3+P0hgXXwoF6awqE7QPVdHKtv4y73h K5hg== X-Forwarded-Encrypted: i=1; AJvYcCUw9pG7UbUfyuFCZxIDevlOrVW8NFAYebbVnDpTJdSuL48gvrvSdSs2hfONYkAi8Q8Y2OoNZ7SCz2M64dkWtP95QxM= X-Gm-Message-State: AOJu0YwIWqB4ZoAoELzwncSpfwyKpsuO31ozP9BCD/zNpLgYmljIf7ED W4z+ZglDV8wEF9bksFROqWXbvIpA7h84LONlJcmU3Hb3HNU/Iuf8EF5DbU01OZig4qHr15sV6ku x8AcljIzvNO1qRH+GGZ0QHweWJzOp8jkNLjZ1zwKH01KJBxT9 X-Received: by 2002:a05:600c:3556:b0:415:45ea:9922 with SMTP id i22-20020a05600c355600b0041545ea9922mr7321906wmq.35.1712049258471; Tue, 02 Apr 2024 02:14:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAXTmxYS4Oc1cF7wX4krEnUxfxUWHfQkDARg+JHFywX9QTcqW29tI/oO+KYKLEUvTRfN79Jg== X-Received: by 2002:a05:600c:3556:b0:415:45ea:9922 with SMTP id i22-20020a05600c355600b0041545ea9922mr7321885wmq.35.1712049258066; Tue, 02 Apr 2024 02:14:18 -0700 (PDT) Received: from ?IPV6:2003:cb:c732:e600:4982:2903:710f:f20a? (p200300cbc732e60049822903710ff20a.dip0.t-ipconnect.de. [2003:cb:c732:e600:4982:2903:710f:f20a]) by smtp.gmail.com with ESMTPSA id n14-20020a05600c4f8e00b0041493e21844sm20413933wmq.27.2024.04.02.02.14.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Apr 2024 02:14:17 -0700 (PDT) Message-ID: <124f2784-7d32-45c2-b548-60818f385257@redhat.com> Date: Tue, 2 Apr 2024 11:14:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1] x86/mm/pat: fix VM_PAT handling in COW mappings To: Ingo Molnar , Andrew Morton Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, Wupeng Ma , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" References: <20240312181118.318701-1-david@redhat.com> <5bc9de2f-c3ba-46e7-a234-3d3a46e53ba1@redhat.com> <922c5f99-1194-4118-9fe2-09b4f4a8cf04@redhat.com> <2420ca24-b475-45ba-bab9-66c11b8cf484@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 79FDE100014 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 74dnrieso5pcixfjge17zxot9uucfkxz X-HE-Tag: 1712049263-41460 X-HE-Meta: U2FsdGVkX19mncpeo8ynxXHI/P5QrFwMGNITBkNc7+ng9dcjSkHLkF5n4qHMK4CpRVlxAY6dxtTtSwQVjKHgHnQKqzGRdYBSpvzXNZxh9vGGCwz8VtWXMw+2s52/gwfHp/ioPBy/yeLAw5JIKwTJBVPDrk+S+05jESAZ9TgzidliWG6d/7/fQDS0FMEPBqshl842fpzvQ5Ddwj1asY+6/1KOJ8MmtpdFCzxqpLnqAy6GgCXzX0KdsRKAXQS9fo7PjyAmETokaRbXcMhdbasyw31uqouR2wBMrhs4uyTGdFFBxHJnDM+4mmkk5lR2QTRtsy1vcXstQwpnMhTIk6jpC1aPjcKEGQ7nxniNS9/W+vG499rpxW1uK5K1OSQyIec3KiBNY4i7hvFI5NvN3qhweiuhlrZhIXalzfWPEB/C+GYLoxp9Pi6wlo3U0IcP/3GQONO0NiES2TlX9TwdA8kK82DCEMNlPtR6pCoWLTesjkKyGTXmCEV/hp+g5vD8mc2jpn4Iwuo+Bv9x1JUsUnqXoXCl+zdT9RkVJSVkA0SYocwwEjRf8HXut8pl096xH7lniy6PDK0WLwyb3fIY14ciVxSjsAQdJJM4FfaHbgq01UiCoXyN8bLhCMbM0iKbmcv16ikKkvBuINeqYsJzkksHDMxq/MZ7tc9fkkgK2EALM2+7B6djDc0ZKFttFroeRL/uFGMECOIYYftb8OZZq2QJum4mvD6f9JIwCXLc2UHjZyuLY7fM9GoWCUUdoiZxVh6AJaPwz0vnQmWcBQnHAr1b7exFHOoqTSthN4gu0GsH9IByrpQiiSN1u4VO7ZvtfQ+BiyEkiBeljnOTOIqxGT4juNQS+Idr4rHEbnCexh7h+NX9igMOmfV9uthBHX0HJvahVbQwMv03m4a4I7Ol8QzstDLm4L6tn/LzQxcV1cwVHpAY4rmrohKtPm9BJSOIX8pp777yVxDV1nT20EtWdpV TKWmFE82 FMLcsfvOBsjD1FDI+YcUGQ7QFqz6fqV30G8xujN/T8Nde+LXgTqiZzuF4cj/P0iD5XQ0hablqmlVDBW3KXk8BKbPF7UIIxrmbCa4D1jbYMjkaPA4Z1OSNXliGgRNKc3xo2J8KeYTGLMJSBRWpbeEKrhpMo1vmfRPe64j+aJFF12828oyp/BmmrD6bxRDL4D+1TseynnDhHnUb7hS7SGDSZgzWLo9PN2zfPkZQuEOb+G1xePhSTwC6FbyC8PX3DI88/4wzjP6eOCYuTIQ7Pp9Hici+d+i7gh0fStuRaXSD3K9sp8XKWerUHaIy8z143gimksL5Vjy7Dg/o2VXPGzbuUko4ubIsUBj5q84SV6VrZYXWYXIJve04LXgRM47GNk1GjUFPKP9XB+grmMUdVutdUou2i0ESmDDSBbHtJcMcAH70lgKCpsjD+wYCKMQENQFZyBhYK3bAaUO0DrAry86Esz8WosegonxIBhld+6Ybtr4Wl4d1aiva92fbBpwIVSuZ63viqBfOdNUkBkji4CHuSZiFZFoyfOcPyVFnAY8wcNedpEU= 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: On 01.04.24 11:45, Ingo Molnar wrote: > > * David Hildenbrand wrote: > >>>>> try the trivial restriction approach first, and only go with your original >>>>> patch if that fails? >>>> >>>> Which version would you prefer, I had two alternatives (excluding comment >>>> changes, white-space expected to be broken). >>>> >>>> >>>> 1) Disallow when we would have set VM_PAT on is_cow_mapping() >>>> >>>> diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c >>>> index 0d72183b5dd0..6979912b1a5d 100644 >>>> --- a/arch/x86/mm/pat/memtype.c >>>> +++ b/arch/x86/mm/pat/memtype.c >>>> @@ -994,6 +994,9 @@ int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, >>>> && size == (vma->vm_end - vma->vm_start))) { >>>> int ret; >>>> + if (is_cow_mapping(vma->vm_flags)) >>>> + return -EINVAL; >>>> + >>>> ret = reserve_pfn_range(paddr, size, prot, 0); >>>> if (ret == 0 && vma) >>>> vm_flags_set(vma, VM_PAT); >>>> >>>> >>>> 2) Fallback to !VM_PAT >>>> >>>> diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c >>>> index 0d72183b5dd0..8e97156c9be8 100644 >>>> --- a/arch/x86/mm/pat/memtype.c >>>> +++ b/arch/x86/mm/pat/memtype.c >>>> @@ -990,8 +990,8 @@ int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, >>>> enum page_cache_mode pcm; >>>> /* reserve the whole chunk starting from paddr */ >>>> - if (!vma || (addr == vma->vm_start >>>> - && size == (vma->vm_end - vma->vm_start))) { >>>> + if (!vma || (!is_cow_mapping(vma->vm_flags) && addr == vma->vm_start && >>>> + size == (vma->vm_end - vma->vm_start))) { >>>> int ret; >>>> ret = reserve_pfn_range(paddr, size, prot, 0); >>>> >>>> >>>> >>>> Personally, I'd go for 2). >>> >>> So what's the advantage of #2? This is clearly something the user didn't >>> really intend or think about much. Isn't explicitly failing that mapping a >>> better option than silently downgrading it to !VM_PAT? >>> >>> (If I'm reading it right ...) >> >> I think a simple mmap(MAP_PRIVATE) of /dev/mem will unconditionally fail >> with 1), while it keeps on working for 2). >> >> Note that I think we currently set VM_PAT on each and every system if >> remap_pfn_range() will cover the whole VMA, even if pat is not actually >> enabled. >> >> It's all a bit of a mess TBH, but I got my hands dirty enough on that. >> >> So 1) can be rather destructive ... 2) at least somehow keeps it working. >> >> For that reason I went with the current patch, because it's hard to tell >> which use case you will end up breaking ... :/ > Hi, > Yeah, so I think you make valid observations, i.e. your first patch is > probably the best one. okay, so the original patch, thanks. > > But since it changes mm/memory.c, I'd like to pass that over to Andrew > and the MM folks. > > The x86 bits: > > Acked-by: Ingo Molnar Thanks, there is now a conflict with other stuff that already landed in mm-unstable that moves follow_phys() to arch/x86/mm/pat/memtype.c. @Andrew, this here is a fix, how should we best handle that? Likely the fix should go in first, and the fixup of Christoph's patch should be easy. Just let me know how you want to handle that. -- Cheers, David / dhildenb