From nobody Sun Dec 14 19:13:27 2025 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9AA8614AD14 for ; Thu, 9 May 2024 10:02:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715248932; cv=none; b=ebB6/Qe+oCezOsHgow5UkAkwTrIOFIci8fg57kBrPTibiW8SG8mgMYhoiEkQcJnYrFbTpIo7D28L8qwM7vlJisJGj4jLeEq9mO7ZIEbcc59S5Nl7qAJsQcPrEpTNkmALqKNXFjehp407IBUYpttNSlstc7hGJpPe4nYcFrDb7Lo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715248932; c=relaxed/simple; bh=S7+PEDPOpa5VRXCzs5IETrmaM5wBA1i1MSuRVDnQ0hk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HGMcvgXeXgJcwMdaJaiZKP5AbNOVrOG2vtkZsOHWzXAwrVADSMdir532Qx0PpgjLPjGT8ct4q5F+VPir7A1SKPOFvWwKXyHY0rCf95DMA0M4tJchp6ejSnYF7lQmJGuiL2JSBpuPN1SpE72tr0dGfeLDuEPjNi+eWGXH4yXnqpA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=iJNOMk0u; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=BJLLF2tH; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=iJNOMk0u; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=BJLLF2tH; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="iJNOMk0u"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="BJLLF2tH"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="iJNOMk0u"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="BJLLF2tH" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 B69B63822C; Thu, 9 May 2024 10:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715248928; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KNxNDL8CliX5ScNdOouEVQHYdAYZp10dvdvoP0daPnA=; b=iJNOMk0uj9LwE54I1NK+1wuLoKmWR8NHqhes5O0I6nOw2c0mgraRXO0Jn5VZIuDLYGh8WS XcmF6vOUjsrojborzt5SKJXT59+bt3kWiKstg7jsjI3QWd4LXFKhG1LP46od9hRQLxmr7p yT7UKaS6mpNX7jmSgsKBmvAkwgfpFoI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715248928; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KNxNDL8CliX5ScNdOouEVQHYdAYZp10dvdvoP0daPnA=; b=BJLLF2tHIR9ux5RHDbXoVxPGdfKBT9VErnyoHGNXwFuOttgPANSzh7bCOXm8+QpgRObb0/ hsyZrh8Mu80ggSCw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=iJNOMk0u; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=BJLLF2tH DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715248928; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KNxNDL8CliX5ScNdOouEVQHYdAYZp10dvdvoP0daPnA=; b=iJNOMk0uj9LwE54I1NK+1wuLoKmWR8NHqhes5O0I6nOw2c0mgraRXO0Jn5VZIuDLYGh8WS XcmF6vOUjsrojborzt5SKJXT59+bt3kWiKstg7jsjI3QWd4LXFKhG1LP46od9hRQLxmr7p yT7UKaS6mpNX7jmSgsKBmvAkwgfpFoI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715248928; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KNxNDL8CliX5ScNdOouEVQHYdAYZp10dvdvoP0daPnA=; b=BJLLF2tHIR9ux5RHDbXoVxPGdfKBT9VErnyoHGNXwFuOttgPANSzh7bCOXm8+QpgRObb0/ hsyZrh8Mu80ggSCw== 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 DC2DD13941; Thu, 9 May 2024 10:02:07 +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 QOsjMx+fPGZbOAAAD6G6ig (envelope-from ); Thu, 09 May 2024 10:02:07 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Muchun Song , Peter Xu , Axel Rasmussen , Liu Shixin , Oscar Salvador Subject: [PATCH 1/2] mm/hugetlb: Add missing VM_FAULT_SET_HINDEX in hugetlb_fault Date: Thu, 9 May 2024 12:01:47 +0200 Message-ID: <20240509100148.22384-2-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240509100148.22384-1-osalvador@suse.de> References: <20240509100148.22384-1-osalvador@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Flag: NO X-Spam-Score: -2.98 X-Rspamd-Action: no action X-Rspamd-Queue-Id: B69B63822C X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-2.98 / 50.00]; BAYES_HAM(-2.97)[99.87%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_SEVEN(0.00)[8]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] Content-Type: text/plain; charset="utf-8" commit af19487f00f3 ("mm: make PTE_MARKER_SWAPIN_ERROR more general") added the code to handle pte_markers in hugetlb faulting path. In case of an UFFD_POISON event, a PTE_MARKER_POISONED will be created and we will return VM_FAULT_HWPOISON_LARGE upon detecting that in the fault pat= h. Add the missing VM_FAULT_SET_HINDEX, so the right si_addr_lsb will be passed to userspace to report the extension of the faulty area. Signed-off-by: Oscar Salvador Acked-by: Axel Rasmussen Acked-by: Peter Xu --- mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 33d175add044..262456daf327 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6485,7 +6485,8 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct= vm_area_struct *vma, pte_marker_get(pte_to_swp_entry(vmf.orig_pte)); =20 if (marker & PTE_MARKER_POISONED) { - ret =3D VM_FAULT_HWPOISON_LARGE; + ret =3D VM_FAULT_HWPOISON_LARGE | + VM_FAULT_SET_HINDEX(hstate_index(h)); goto out_mutex; } } --=20 2.44.0 From nobody Sun Dec 14 19:13:27 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C803514B07E for ; Thu, 9 May 2024 10:02:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715248934; cv=none; b=lwnsmH1Z0OoB6sn2ZWYkkPMBZ4JiqdZsN5Fc4AsqfEWSMm9f9icU1er5hEXAMb7uwbcMx0xUuX+1CozRmNsRRPAvn76/pV8hcCFTJl/Ds/SK/ij/KNplpNHSvGl0X0sD9DePd0P1qxNooOWnrCJJBSJRW8zOqIvIONF55Q0/1MY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715248934; c=relaxed/simple; bh=EGxnPS0yhiH1vdHZvJ5vJ0VsWmcUYd/h7Lji8/SatuA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MamfGnjZ0B1pe6PonpITjF20jLPviXSDl2Tfr3RcH9KKZPoZcDK8NeswX6QEFPOlhRFsZFwgnrozzYQPFzedkEbG3/pfsLWCRA96q97jqRNWFUH6dulLZ9ri7LxqSXRxsAYwG1qQcnBDjyRyUWClIb+pe6LFlnFWwuKJNHqQNv8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=yrG/oC93; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=kBBKn7Nm; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=yrG/oC93; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=kBBKn7Nm; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="yrG/oC93"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="kBBKn7Nm"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="yrG/oC93"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="kBBKn7Nm" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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-out2.suse.de (Postfix) with ESMTPS id DC2345FC50; Thu, 9 May 2024 10:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715248930; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fH9mcFMskWdh4UuFUQbCoC6swB7vTaoxR3AzCi/uWRg=; b=yrG/oC93h5JV8qQmse+DMDxdJ3XjcpoZ8p9RWPbh8qeIgBEK4uSnqJXtVl+5s5vB3Ir2oP gbL318bcbu5brHByri1fMi3aKj6H6X4TUb1QAgT0iEco9HOk/w8ffwlxdL832dk5VmZDXw BZlAyoxMZz7UEC75NwUYOkgb4qorXMU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715248930; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fH9mcFMskWdh4UuFUQbCoC6swB7vTaoxR3AzCi/uWRg=; b=kBBKn7Nmv3J/YzvrHjy1h4S3Y+YMOCrtdI5mhdpzd8xfufJcrmzRkM0Qyvz9ZaUPv/7p9f 8EiDPJlRTErRyMCA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715248930; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fH9mcFMskWdh4UuFUQbCoC6swB7vTaoxR3AzCi/uWRg=; b=yrG/oC93h5JV8qQmse+DMDxdJ3XjcpoZ8p9RWPbh8qeIgBEK4uSnqJXtVl+5s5vB3Ir2oP gbL318bcbu5brHByri1fMi3aKj6H6X4TUb1QAgT0iEco9HOk/w8ffwlxdL832dk5VmZDXw BZlAyoxMZz7UEC75NwUYOkgb4qorXMU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715248930; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fH9mcFMskWdh4UuFUQbCoC6swB7vTaoxR3AzCi/uWRg=; b=kBBKn7Nmv3J/YzvrHjy1h4S3Y+YMOCrtdI5mhdpzd8xfufJcrmzRkM0Qyvz9ZaUPv/7p9f 8EiDPJlRTErRyMCA== 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 3C31B13941; Thu, 9 May 2024 10:02:10 +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 WHeLCSKfPGZbOAAAD6G6ig (envelope-from ); Thu, 09 May 2024 10:02:10 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Muchun Song , Peter Xu , Axel Rasmussen , Liu Shixin , Oscar Salvador Subject: [PATCH 2/2] mm/hugetlb: Add missing VM_FAULT_SET_HINDEX in hugetlb_wp Date: Thu, 9 May 2024 12:01:48 +0200 Message-ID: <20240509100148.22384-3-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240509100148.22384-1-osalvador@suse.de> References: <20240509100148.22384-1-osalvador@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Level: X-Spamd-Result: default: False [-2.44 / 50.00]; BAYES_HAM(-2.64)[98.42%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_SEVEN(0.00)[8]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:email]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.44 X-Spam-Flag: NO Content-Type: text/plain; charset="utf-8" commit 1cb9dc4b475c ("mm: hwpoison: support recovery from HugePage copy-on-write faults") added support to use the mc variants when coping hugetlb pages on CoW faults. Add the missing VM_FAULT_SET_HINDEX, so the right si_addr_lsb will be passed to userspace to report the extension of the faulty area. Signed-off-by: Oscar Salvador Acked-by: Axel Rasmussen Acked-by: Peter Xu --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 262456daf327..6be78e7d4f6e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6067,7 +6067,7 @@ static vm_fault_t hugetlb_wp(struct folio *pagecache_= folio, goto out_release_all; =20 if (copy_user_large_folio(new_folio, old_folio, vmf->real_address, vma)) { - ret =3D VM_FAULT_HWPOISON_LARGE; + ret =3D VM_FAULT_HWPOISON_LARGE | VM_FAULT_SET_HINDEX(hstate_index(h)); goto out_release_all; } __folio_mark_uptodate(new_folio); --=20 2.44.0