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 6C939D15D95 for ; Mon, 21 Oct 2024 13:45:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5AD66B0082; Mon, 21 Oct 2024 09:45:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0A326B0088; Mon, 21 Oct 2024 09:45:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAAF76B0089; Mon, 21 Oct 2024 09:45:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 8BEF96B0082 for ; Mon, 21 Oct 2024 09:45:36 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8816E41932 for ; Mon, 21 Oct 2024 13:45:27 +0000 (UTC) X-FDA: 82697731242.19.21F600A Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf18.hostedemail.com (Postfix) with ESMTP id 57DB61C0027 for ; Mon, 21 Oct 2024 13:45:27 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ws2Igw2z; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=WdG5HOtV; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ws2Igw2z; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=WdG5HOtV; dmarc=none; spf=pass (imf18.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729518297; a=rsa-sha256; cv=none; b=a3X/ybaYdJbQ93ll1ypHHRuFTn9ywm1Gmyxf+lVHLb5ZbailO8qjZNuP72mJd4WoodA+dG rq9ivtnItcBg/ZaQqo0WJbIQJjWVr8ULNDf9ud1+7e3k+eoYpMvDKrQkCn9w7fp/qJyyYJ JWt6jsDE3La9RzEKgzq1LWdKy34ZFPo= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ws2Igw2z; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=WdG5HOtV; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ws2Igw2z; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=WdG5HOtV; dmarc=none; spf=pass (imf18.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729518297; 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=PyMmciJRNxnxSdGpKDKPR0edGBWKV8q0o9aCTJHOth0=; b=nAF3dJwrYpELH2vt25WoqODJJCZiAW9OctQc0/UsO/BwtYAKugorkyoSoeebLaRCpe9zha IXTcTVAO9x+guKG53ctVGRaDv4j/hWWggZ5OPW+z5xXbjKM8s02LJ5SG1/IbiPy8N9twZS KqxSrBGa67nrEMXBL2qgvQYCGMRqbqA= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 01CBF21DFC; Mon, 21 Oct 2024 13:45:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1729518332; h=from:from:reply-to: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=PyMmciJRNxnxSdGpKDKPR0edGBWKV8q0o9aCTJHOth0=; b=ws2Igw2zZz+rY4trofwlqSPIJQ7d6REIjxJuentTnW63lFaZNy9OtQ+qvjhiDOfqD8d/so ygZbKCPx+7tIGtDQ0aqqKrxjmWToNQRU5zvh+tkntt8zc9GWC7InvL5VVyE/iIQbSgUSaJ TPj34bDP1QAk60BOv4eZGJutH2dUWHI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1729518332; h=from:from:reply-to: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=PyMmciJRNxnxSdGpKDKPR0edGBWKV8q0o9aCTJHOth0=; b=WdG5HOtVcTOjGR9YYMEL5ewSD5q6CnKTIToPQtU5OSIvLT29r5EumNuX0xcK8WhkkQAHXU +WS2rZP95kmQi/AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1729518332; h=from:from:reply-to: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=PyMmciJRNxnxSdGpKDKPR0edGBWKV8q0o9aCTJHOth0=; b=ws2Igw2zZz+rY4trofwlqSPIJQ7d6REIjxJuentTnW63lFaZNy9OtQ+qvjhiDOfqD8d/so ygZbKCPx+7tIGtDQ0aqqKrxjmWToNQRU5zvh+tkntt8zc9GWC7InvL5VVyE/iIQbSgUSaJ TPj34bDP1QAk60BOv4eZGJutH2dUWHI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1729518332; h=from:from:reply-to: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=PyMmciJRNxnxSdGpKDKPR0edGBWKV8q0o9aCTJHOth0=; b=WdG5HOtVcTOjGR9YYMEL5ewSD5q6CnKTIToPQtU5OSIvLT29r5EumNuX0xcK8WhkkQAHXU +WS2rZP95kmQi/AQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B7079139E0; Mon, 21 Oct 2024 13:45:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OB9CLPtaFmdiRwAAD6G6ig (envelope-from ); Mon, 21 Oct 2024 13:45:31 +0000 Message-ID: <9c0991db-9bf8-414c-b3b0-446023df2a7a@suse.cz> Date: Mon, 21 Oct 2024 15:45:31 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/5] mm: add PTE_MARKER_GUARD PTE marker Content-Language: en-US To: Lorenzo Stoakes , Andrew Morton Cc: Suren Baghdasaryan , "Liam R . Howlett" , Matthew Wilcox , "Paul E . McKenney" , Jann Horn , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song , Richard Henderson , Ivan Kokshaysky , Matt Turner , Thomas Bogendoerfer , "James E . J . Bottomley" , Helge Deller , Chris Zankel , Max Filippov , Arnd Bergmann , linux-alpha@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linux-arch@vger.kernel.org, Shuah Khan , Christian Brauner , linux-kselftest@vger.kernel.org, Sidhartha Kumar , Jeff Xu , Christoph Hellwig , linux-api@vger.kernel.org, John Hubbard References: <081837b697a98c7fa5832542b20f603d49e0b557.1729440856.git.lorenzo.stoakes@oracle.com> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= xsFNBFZdmxYBEADsw/SiUSjB0dM+vSh95UkgcHjzEVBlby/Fg+g42O7LAEkCYXi/vvq31JTB KxRWDHX0R2tgpFDXHnzZcQywawu8eSq0LxzxFNYMvtB7sV1pxYwej2qx9B75qW2plBs+7+YB 87tMFA+u+L4Z5xAzIimfLD5EKC56kJ1CsXlM8S/LHcmdD9Ctkn3trYDNnat0eoAcfPIP2OZ+ 9oe9IF/R28zmh0ifLXyJQQz5ofdj4bPf8ecEW0rhcqHfTD8k4yK0xxt3xW+6Exqp9n9bydiy tcSAw/TahjW6yrA+6JhSBv1v2tIm+itQc073zjSX8OFL51qQVzRFr7H2UQG33lw2QrvHRXqD Ot7ViKam7v0Ho9wEWiQOOZlHItOOXFphWb2yq3nzrKe45oWoSgkxKb97MVsQ+q2SYjJRBBH4 8qKhphADYxkIP6yut/eaj9ImvRUZZRi0DTc8xfnvHGTjKbJzC2xpFcY0DQbZzuwsIZ8OPJCc LM4S7mT25NE5kUTG/TKQCk922vRdGVMoLA7dIQrgXnRXtyT61sg8PG4wcfOnuWf8577aXP1x 6mzw3/jh3F+oSBHb/GcLC7mvWreJifUL2gEdssGfXhGWBo6zLS3qhgtwjay0Jl+kza1lo+Cv BB2T79D4WGdDuVa4eOrQ02TxqGN7G0Biz5ZLRSFzQSQwLn8fbwARAQABzSBWbGFzdGltaWwg QmFia2EgPHZiYWJrYUBzdXNlLmN6PsLBlAQTAQoAPgIbAwULCQgHAwUVCgkICwUWAgMBAAIe AQIXgBYhBKlA1DSZLC6OmRA9UCJPp+fMgqZkBQJkBREIBQkRadznAAoJECJPp+fMgqZkNxIQ ALZRqwdUGzqL2aeSavbum/VF/+td+nZfuH0xeWiO2w8mG0+nPd5j9ujYeHcUP1edE7uQrjOC Gs9sm8+W1xYnbClMJTsXiAV88D2btFUdU1mCXURAL9wWZ8Jsmz5ZH2V6AUszvNezsS/VIT87 AmTtj31TLDGwdxaZTSYLwAOOOtyqafOEq+gJB30RxTRE3h3G1zpO7OM9K6ysLdAlwAGYWgJJ V4JqGsQ/lyEtxxFpUCjb5Pztp7cQxhlkil0oBYHkudiG8j1U3DG8iC6rnB4yJaLphKx57NuQ PIY0Bccg+r9gIQ4XeSK2PQhdXdy3UWBr913ZQ9AI2usid3s5vabo4iBvpJNFLgUmxFnr73SJ KsRh/2OBsg1XXF/wRQGBO9vRuJUAbnaIVcmGOUogdBVS9Sun/Sy4GNA++KtFZK95U7J417/J Hub2xV6Ehc7UGW6fIvIQmzJ3zaTEfuriU1P8ayfddrAgZb25JnOW7L1zdYL8rXiezOyYZ8Fm ZyXjzWdO0RpxcUEp6GsJr11Bc4F3aae9OZtwtLL/jxc7y6pUugB00PodgnQ6CMcfR/HjXlae h2VS3zl9+tQWHu6s1R58t5BuMS2FNA58wU/IazImc/ZQA+slDBfhRDGYlExjg19UXWe/gMcl De3P1kxYPgZdGE2eZpRLIbt+rYnqQKy8UxlszsBNBFsZNTUBCACfQfpSsWJZyi+SHoRdVyX5 J6rI7okc4+b571a7RXD5UhS9dlVRVVAtrU9ANSLqPTQKGVxHrqD39XSw8hxK61pw8p90pg4G /N3iuWEvyt+t0SxDDkClnGsDyRhlUyEWYFEoBrrCizbmahOUwqkJbNMfzj5Y7n7OIJOxNRkB IBOjPdF26dMP69BwePQao1M8Acrrex9sAHYjQGyVmReRjVEtv9iG4DoTsnIR3amKVk6si4Ea X/mrapJqSCcBUVYUFH8M7bsm4CSxier5ofy8jTEa/CfvkqpKThTMCQPNZKY7hke5qEq1CBk2 wxhX48ZrJEFf1v3NuV3OimgsF2odzieNABEBAAHCwXwEGAEKACYCGwwWIQSpQNQ0mSwujpkQ PVAiT6fnzIKmZAUCZAUSmwUJDK5EZgAKCRAiT6fnzIKmZOJGEACOKABgo9wJXsbWhGWYO7mD 8R8mUyJHqbvaz+yTLnvRwfe/VwafFfDMx5GYVYzMY9TWpA8psFTKTUIIQmx2scYsRBUwm5VI EurRWKqENcDRjyo+ol59j0FViYysjQQeobXBDDE31t5SBg++veI6tXfpco/UiKEsDswL1WAr tEAZaruo7254TyH+gydURl2wJuzo/aZ7Y7PpqaODbYv727Dvm5eX64HCyyAH0s6sOCyGF5/p eIhrOn24oBf67KtdAN3H9JoFNUVTYJc1VJU3R1JtVdgwEdr+NEciEfYl0O19VpLE/PZxP4wX PWnhf5WjdoNI1Xec+RcJ5p/pSel0jnvBX8L2cmniYnmI883NhtGZsEWj++wyKiS4NranDFlA HdDM3b4lUth1pTtABKQ1YuTvehj7EfoWD3bv9kuGZGPrAeFNiHPdOT7DaXKeHpW9homgtBxj 8aX/UkSvEGJKUEbFL9cVa5tzyialGkSiZJNkWgeHe+jEcfRT6pJZOJidSCdzvJpbdJmm+eED w9XOLH1IIWh7RURU7G1iOfEfmImFeC3cbbS73LQEFGe1urxvIH5K/7vX+FkNcr9ujwWuPE9b 1C2o4i/yZPLXIVy387EjA6GZMqvQUFuSTs/GeBcv0NjIQi8867H3uLjz+mQy63fAitsDwLmR EP+ylKVEKb0Q2A== In-Reply-To: <081837b697a98c7fa5832542b20f603d49e0b557.1729440856.git.lorenzo.stoakes@oracle.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Stat-Signature: jc48kxx8zqaou1a4dxcfe3kb98gu9bff X-Rspamd-Queue-Id: 57DB61C0027 X-Rspamd-Server: rspam02 X-HE-Tag: 1729518327-368382 X-HE-Meta: U2FsdGVkX1867l0zTApm/oxJW8IamrIHBsRkSeFf7rnlLU+okZUwyv3W8C+chzP5T62P88VdC6v2OC9fLYpaJQizMc4kqxaXMMHB5pvKQPvIELoDBdjgVPcpUZKGekrx8f7jac5zMO4AFPhGC//5LpEy5QesACZqOtg4zM8SueU3Rj8SGXey9LeTj/mmVhakGWn8u5yQLYeXAUSMO70awok9p9qq4D3AvMNjfORrmMd0onVOaav5cNOvK0yGCX206u/FhTvI0JmmArXwWV8j/Ttfm33w7faz1AqDVJ4GcRP61ksazRmIrqaHw9UPAcmMMc3UA/YEw3dWu+ibiwWE3y9T+ZimiOC5jzCsnWy5slPa9bq6k6cIZIS6QKIVq/UII1QnpurFeQ0Uk8MIIi9fWNlGLjNsMQji+XPLHh4K7ei0e/tRz3KZxSpTTI4DIsMUuv+eREs2gJQMgs/Aab5HJEN0njr5+P7hktGHfmpZH411hffB63L9HbYHNu/RYwafSKv9HPGl16dw86OeDe2ALaYay6lZVtfn5v2bMdhll1oezvRTwI80jy9nKuXv1HUeUYKP7ZQBzWUMJKUJ6G5Ml/vMsaxOqdrbS1CDnNL5Hu8uOG8xsg77iCrEX8ypAm5JD7P1m8luxWLfYpl5oNEwC4XTWHTGfvVb1Ed4kg+AQJkh75nrDJofx7HY5vZF6LSZqi71nPpXnoKTcrYgcOjz1VzUG5ln/1DC7IT6YJYLeb3In1+PSBmyz2tcxkybz1i3IlN72z+9WhSNDPQWRzD9NJ2n5r/NXzCtyTFIKlb4FY3e9d/6iX8+vp+C2umeY1KYEO2b/fYNpEY5CZVaysDs7+sJzUPnAc9nWDmi9ft463+I4Zx0jrOKbA9m0cqtou/g3V8QgOwVe04BEHjdSCPMnDYtw3ODFc4lQ/nbtPfWeAM38gYVkUBaM1syOrIxlieK2tO6qFerrm7J0yZPNMt TombtdeK XZXC7ITInDlYImJa1wHIEBDBsFYZrv6MxxvelH/I/xsCy8sQHlgrr9bZdj+WUB0An9UMewjL2BFrnN0wlvverAjHSh7//LKRdJw6Ctt1NCF2T4jF7WkivQr30ZNbbG/QyMigPINuaUG6g2oBR+ZttQ9nvkKnaSBKCAL0AGmSvU62/tO5j5c2AjASrUhmWMeJNJICJwIgQMiySIF4xXKr4LjA2UVMjeWO+5Cw9lKs6QN3fOeReDdYIBfCSIaQEgjyXNrDrRliLbQCs+nqQXNcSrU37ct4QUvBCUzggfnTIJd3NSzOAjaH6qtQKmqnJF6NiA28M2bT7mzH+dwLm9Yanf82O/2daSEBbkOMb2egaD6BBAmQ= 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 10/20/24 18:20, Lorenzo Stoakes wrote: > Add a new PTE marker that results in any access causing the accessing > process to segfault. Should we distinguish it from other segfaults? Is there a way? I can see memory protection keys use SEGV_PKUERR, but no idea if we have any free values. > This is preferable to PTE_MARKER_POISONED, which results in the same > handling as hardware poisoned memory, and is thus undesirable for cases > where we simply wish to 'soft' poison a range. > > This is in preparation for implementing the ability to specify guard pages > at the page table level, i.e. ranges that, when accessed, should cause > process termination. > > Additionally, rename zap_drop_file_uffd_wp() to zap_drop_markers() - the > function checks the ZAP_FLAG_DROP_MARKER flag so naming it for this single > purpose was simply incorrect. > > We then reuse the same logic to determine whether a zap should clear a > guard entry - this should only be performed on teardown and never on > MADV_DONTNEED or the like. > > Signed-off-by: Lorenzo Stoakes Acked-by: Vlastimil Babka A nit below: > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 906294ac85dc..50e3f6ed73ac 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -6353,6 +6353,9 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, > ret = VM_FAULT_HWPOISON_LARGE | > VM_FAULT_SET_HINDEX(hstate_index(h)); > goto out_mutex; > + } else if (marker & PTE_MARKER_GUARD) { > + ret = VM_FAULT_SIGSEGV; > + goto out_mutex; Given we don't support hugetlb, should we WARN_ON_ONCE() if such unexpected marker appears there? > } > } > > diff --git a/mm/memory.c b/mm/memory.c > index 0f614523b9f4..551455cd453f 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -1455,7 +1455,7 @@ static inline bool should_zap_folio(struct zap_details *details, > return !folio_test_anon(folio); > } > > -static inline bool zap_drop_file_uffd_wp(struct zap_details *details) > +static inline bool zap_drop_markers(struct zap_details *details) > { > if (!details) > return false; > @@ -1476,7 +1476,7 @@ zap_install_uffd_wp_if_needed(struct vm_area_struct *vma, > if (vma_is_anonymous(vma)) > return; > > - if (zap_drop_file_uffd_wp(details)) > + if (zap_drop_markers(details)) > return; > > for (;;) { > @@ -1671,7 +1671,15 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, > * drop the marker if explicitly requested. > */ > if (!vma_is_anonymous(vma) && > - !zap_drop_file_uffd_wp(details)) > + !zap_drop_markers(details)) > + continue; > + } else if (is_guard_swp_entry(entry)) { > + /* > + * Ordinary zapping should not remove guard PTE > + * markers. Only do so if we should remove PTE markers > + * in general. > + */ > + if (!zap_drop_markers(details)) > continue; > } else if (is_hwpoison_entry(entry) || > is_poisoned_swp_entry(entry)) { > @@ -4003,6 +4011,10 @@ static vm_fault_t handle_pte_marker(struct vm_fault *vmf) > if (marker & PTE_MARKER_POISONED) > return VM_FAULT_HWPOISON; > > + /* Hitting a guard page is always a fatal condition. */ > + if (marker & PTE_MARKER_GUARD) > + return VM_FAULT_SIGSEGV; > + > if (pte_marker_entry_uffd_wp(entry)) > return pte_marker_handle_uffd_wp(vmf); >