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 6BFE3C4332F for ; Mon, 14 Nov 2022 16:41:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCACA6B0074; Mon, 14 Nov 2022 11:41:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C53506B0075; Mon, 14 Nov 2022 11:41:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACE018E0001; Mon, 14 Nov 2022 11:41:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 973796B0074 for ; Mon, 14 Nov 2022 11:41:11 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 66D7540926 for ; Mon, 14 Nov 2022 16:41:11 +0000 (UTC) X-FDA: 80132612742.24.9139E16 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id D8FC91C0012 for ; Mon, 14 Nov 2022 16:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668444070; 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=jZ1hrVX7kXFY0qnXApuXHacxT8A1bIDmlqR7XFCqRdI=; b=BsJCibRMRPlRf176ZcyQ5OnOcEwRlV+jUHBRF3RvYjmuYi2mans8p2NZ6fnKqQPumaxqXg Sofc6VEeWET/LYrm11tVV3bJ+Sa8fPg+QoTEbWgVlUl5dYhtZNTJUNDP7TB7JevbvnUlax d+HcZrlsR1+//PVlas7mIYN5X0MW9iA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-121-YlD46fXjM1iYhBDLw_ztwQ-1; Mon, 14 Nov 2022 11:41:06 -0500 X-MC-Unique: YlD46fXjM1iYhBDLw_ztwQ-1 Received: by mail-wm1-f72.google.com with SMTP id m17-20020a05600c3b1100b003cf9cc47da5so6981590wms.9 for ; Mon, 14 Nov 2022 08:41:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jZ1hrVX7kXFY0qnXApuXHacxT8A1bIDmlqR7XFCqRdI=; b=bkPZijR8aUqIbp2bNzQLSfhmYhsAN+WQwVjc526JtIOJhZICjg2unZn/xxrp4JmNRx m5hLgv/wBhU7ZgG1P6FZC/AV7D9UV1RWBiMRjgNhTtNhwvBuxRnRDVEqQ9+/lu0rbcDH /vwWplYwGk9SEk6eQrUTxPtJEEU01zn5+di2IqnozM6cXpR1nLogeaSkLUH6VEdkl+GQ c8wwmpY5dQWCrwYmtiBD3/YTHIzET+CKVSvkIwkfDGqnklB75GV518tEuWAdd7XhpHaF 4G/+qFunkfm40aA9ZMCDA+Yx37nyzjdA6uEp1tFohykPuNbrd2Fvv6DqgDHMEkWpQ7TZ KjZw== X-Gm-Message-State: ANoB5plNuafl4loS4YTAoxtbSNO03jB0wTij34JiysZnToDfYyqKuGBs ft2LASQKVcM9O3LfGryWmLZa91Odx7ahE0y8qKbq4nI95ptyAcUb3RdkIyfKGxESsO0EpuFQ7L0 KZf+Zt1CMsJI= X-Received: by 2002:adf:ce01:0:b0:22e:31a4:2323 with SMTP id p1-20020adfce01000000b0022e31a42323mr8207888wrn.691.1668444065074; Mon, 14 Nov 2022 08:41:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf6HOm5uZoYYfwRZ6fSo7NFXg+Fb6KpdFP3sohZDKA9PBTJcMcvvSRIYmlAZ4q5NmmrOzg19aQ== X-Received: by 2002:adf:ce01:0:b0:22e:31a4:2323 with SMTP id p1-20020adfce01000000b0022e31a42323mr8207874wrn.691.1668444064801; Mon, 14 Nov 2022 08:41:04 -0800 (PST) Received: from ?IPV6:2003:cb:c703:d300:d881:1fd5:bc95:5e2d? (p200300cbc703d300d8811fd5bc955e2d.dip0.t-ipconnect.de. [2003:cb:c703:d300:d881:1fd5:bc95:5e2d]) by smtp.gmail.com with ESMTPSA id z15-20020a056000110f00b0022a3a887ceasm10012300wrw.49.2022.11.14.08.41.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Nov 2022 08:41:04 -0800 (PST) Message-ID: Date: Mon, 14 Nov 2022 17:41:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [PATCH] mm/memory: Return vm_fault_t result from migrate_to_ram() callback To: Alistair Popple , linux-mm@kvack.org, Andrew Morton Cc: dri-devel@lists.freedesktop.org, Ralph Campbell , John Hubbard , Alex Sierra , Ben Skeggs , Felix Kuehling , Lyude Paul , Jason Gunthorpe , Michael Ellerman References: <20221114115537.727371-1-apopple@nvidia.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20221114115537.727371-1-apopple@nvidia.com> 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668444070; 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=jZ1hrVX7kXFY0qnXApuXHacxT8A1bIDmlqR7XFCqRdI=; b=L8Vniq4BdbYNlfFZl1PLXlh/EnLpklhfZzSy00qA6SweTmoc1kFDvoKsZ9NUqAqx12ErYp GCcqwz04I6TM8GIrXV5asoJsmKXaEDWM8ayygVPXE2Ei3YjobiAbWhUXwY84l0xRHNiwWv nr/7j7pGiqdl4wNEbqxUZEuxbscD4dY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BsJCibRM; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.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=1668444070; a=rsa-sha256; cv=none; b=M1cvVVUsUT856ZjIPSXtGPsSxol/tfbmEfTAbFIGZPDSgmdhUBjFLwZAFYo/g90+Dh7LfD kqmwuHayX5FKUJnZUoOpHqgCcy+U0bsYqW/6qSg93JcoqteiXypOsk4RlHPJD2J2ioeupo jqNI0I9oipckHNypEolHyERREpOxIR0= X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: D8FC91C0012 X-Rspam-User: Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BsJCibRM; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com X-Stat-Signature: murnwxfynztrgrf4gqpffo61axpzs4as X-HE-Tag: 1668444070-77853 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: On 14.11.22 12:55, Alistair Popple wrote: > The migrate_to_ram() callback should always succeed, but in rare cases > can fail usually returning VM_FAULT_SIGBUS. Commit 16ce101db85d > ("mm/memory.c: fix race when faulting a device private page") > incorrectly stopped passing the return code up the stack. Fix this by > setting the ret variable, restoring the previous behaviour on > migrate_to_ram() failure. > > Fixes: 16ce101db85d ("mm/memory.c: fix race when faulting a device private page") > Signed-off-by: Alistair Popple > Cc: Ralph Campbell > Cc: John Hubbard > Cc: Alex Sierra > Cc: Ben Skeggs > Cc: Felix Kuehling > Cc: Lyude Paul > Cc: Jason Gunthorpe > Cc: Michael Ellerman > > --- > > Hi Andrew, I noticed my series needs another small fix which I'm > hoping you can apply for v6.1-rcX. Thanks (and sorry for not catching > this sooner). > --- > mm/memory.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/memory.c b/mm/memory.c > index f88c351aecd4..8a6d5c823f91 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3763,7 +3763,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > */ > get_page(vmf->page); > pte_unmap_unlock(vmf->pte, vmf->ptl); > - vmf->page->pgmap->ops->migrate_to_ram(vmf); > + ret = vmf->page->pgmap->ops->migrate_to_ram(vmf); > put_page(vmf->page); > } else if (is_hwpoison_entry(entry)) { > ret = VM_FAULT_HWPOISON; Acked-by: David Hildenbrand -- Thanks, David / dhildenb