Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp162313pxj; Wed, 26 May 2021 19:15:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz33yyPtX9iQ+UMLvriG60NRfoDUF/Qe0Q/b9vpj6T5vwyJd398FE+Fz90qoNZY1MxBXPtm X-Received: by 2002:a17:906:6009:: with SMTP id o9mr1290427ejj.204.1622081742002; Wed, 26 May 2021 19:15:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622081741; cv=none; d=google.com; s=arc-20160816; b=aIgK7rABSkmahZdz8M6UeOOAklYzq0VO1W9uJsBpUYM7d1m7bBT4gtXUCXU43S1AE5 MPgx0VasHkQdr1Zuq1wxiWAeDG8dXu6PnXRAzha0SdeV86pNsYfZQwa81LXH6LQm2bn0 xLtKvq0DAsXJO4JjovkwOyIAGSMO3yTpKAlEeCsNsxlqBCRsuc2VrQSpUwI4p/DYHgfa OM2JYcoH9OBUUCn6QHfttrbjR1rAatIVWeOY0N0bZj+ZnDHg4G3dLVc6j+gnTavwRLaE eAFdLmBstMTHKGkH2C5K15XOWN320r/TzZwHBNoSMaQKDw7j85b6faYovWV6KTyUY1EI o1dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=VpnQjRLTYtvem4bmBp1ngvgaZaWU0A6eMfZva3aBJoc=; b=V1j67s53vs4ytiKO1N8H0G3KgC6m5jxmRvj4yat5xs+q+FJSaXaCEL0D119hpEEbC4 TcOpYdrlVFondcXJUgbocQr2pz0yErE7A34GUQsCBOaxUfKzmJkNGMeUmnt5GUnV88Kv zIiMf/Afi+0KAzUca/p7UVMv/TDgUrjH1+ldYrvqM67z/4No7YBFiQDx5Wma3XNfQ/7D MJhHrGxeWBYNCczFnG5/j8TFosZcHxZnpAZIlI2CWSo0tuU8N5pzEB0uIQTHLYD6vtac eaAnSuPO/CkfmcusDrKZ5DqOrWeDB90gDYlZWLm1qCPjPePB08K+uwH1sLL0KMWR1S3z 4O+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=B5RO3Baf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f12si780048edx.197.2021.05.26.19.15.10; Wed, 26 May 2021 19:15:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=B5RO3Baf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233653AbhE0BqB (ORCPT + 99 others); Wed, 26 May 2021 21:46:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60517 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232943AbhE0BqA (ORCPT ); Wed, 26 May 2021 21:46:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622079867; 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: in-reply-to:in-reply-to:references:references; bh=VpnQjRLTYtvem4bmBp1ngvgaZaWU0A6eMfZva3aBJoc=; b=B5RO3BafCwdd5e/C/Vpai1TiK9oVxl7N85p58LNFZmyiYpB3wOBKScfaOlXzQY38yzO6zk QQUNjNueMVvgheq0bK6uocsAotVbB7ykN0boX5dJWSLyyExGZv2pn8EAdOriNdfKkgF01f rqXzYKmr0rie/Q4mjZTUWTWYd5bgl4s= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-405-ARcTWUI9O92fbN3bL_mDqA-1; Wed, 26 May 2021 21:44:25 -0400 X-MC-Unique: ARcTWUI9O92fbN3bL_mDqA-1 Received: by mail-qk1-f198.google.com with SMTP id i141-20020a379f930000b02902e94f6d938dso2288241qke.5 for ; Wed, 26 May 2021 18:44:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=VpnQjRLTYtvem4bmBp1ngvgaZaWU0A6eMfZva3aBJoc=; b=abahkSJc5ZPM6CbKZ6L2KFDAFDPmsvE97/3FMktpPjeVhlZ56bG5gYMoSFYHKAvFDd GfWysAL3bHTJAjXZRdXH/uX5igoxcgX2GmHdK4FZhQXYFBJGiRaS9K2K6mZXzYjAr5qg +veMOtUa8JxszT6OmAoe0140JF2MPSemQrfCEF1tqStCoad6wnGO/PVGrryZsH/JO/zI OzqQYJzTn5/HpbOYOYTpihkUowH2fr608atBgjwOo27wcj9bOeum2ImO9i0Aw7Qez80D MHUHA7wNbORY5LsMk5evWf62oszGI1kU7xitnmWacvxiJHM67hYEPI6KfpDxabHVv0RF uVsw== X-Gm-Message-State: AOAM530rZqxDdvjFo0BEZUwudZP6EXf9BM7M2IO++nkY9wpKJJzj/7lr rpvaIPvgj1/bi8EpxniH13QH0lT2ZxximC9+IdHoY4e4ik4OZFcJEgkQAVxwNQSRqjvU9gzFZtX NjhivGvidyUrWDALQ8FQwbBk8 X-Received: by 2002:ac8:58c9:: with SMTP id u9mr1105867qta.58.1622079865059; Wed, 26 May 2021 18:44:25 -0700 (PDT) X-Received: by 2002:ac8:58c9:: with SMTP id u9mr1105834qta.58.1622079864805; Wed, 26 May 2021 18:44:24 -0700 (PDT) Received: from t490s (bras-base-toroon474qw-grc-72-184-145-4-219.dsl.bell.ca. [184.145.4.219]) by smtp.gmail.com with ESMTPSA id y1sm498232qkp.21.2021.05.26.18.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 18:44:23 -0700 (PDT) Date: Wed, 26 May 2021 21:44:22 -0400 From: Peter Xu To: Alistair Popple Cc: linux-mm@kvack.org, akpm@linux-foundation.org, nouveau@lists.freedesktop.org, bskeggs@redhat.com, rcampbell@nvidia.com, linux-doc@vger.kernel.org, jhubbard@nvidia.com, bsingharora@gmail.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, hch@infradead.org, jglisse@redhat.com, willy@infradead.org, jgg@nvidia.com, hughd@google.com Subject: Re: [PATCH v9 06/10] mm/memory.c: Allow different return codes for copy_nonpresent_pte() Message-ID: References: <20210524132725.12697-1-apopple@nvidia.com> <20210524132725.12697-7-apopple@nvidia.com> <2005328.bFqPmhE5MS@nvdebian> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <2005328.bFqPmhE5MS@nvdebian> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 27, 2021 at 11:20:36AM +1000, Alistair Popple wrote: > On Thursday, 27 May 2021 5:50:05 AM AEST Peter Xu wrote: > > On Mon, May 24, 2021 at 11:27:21PM +1000, Alistair Popple wrote: > > > Currently if copy_nonpresent_pte() returns a non-zero value it is > > > assumed to be a swap entry which requires further processing outside the > > > loop in copy_pte_range() after dropping locks. This prevents other > > > values being returned to signal conditions such as failure which a > > > subsequent change requires. > > > > > > Instead make copy_nonpresent_pte() return an error code if further > > > processing is required and read the value for the swap entry in the main > > > loop under the ptl. > > > > > > Signed-off-by: Alistair Popple > > > > > > --- > > > > > > v9: > > > > > > New for v9 to allow device exclusive handling to occur in > > > copy_nonpresent_pte(). > > > --- > > > > > > mm/memory.c | 12 +++++++----- > > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > > > diff --git a/mm/memory.c b/mm/memory.c > > > index 2fb455c365c2..e061cfa18c11 100644 > > > --- a/mm/memory.c > > > +++ b/mm/memory.c > > > @@ -718,7 +718,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct > > > mm_struct *src_mm,> > > > if (likely(!non_swap_entry(entry))) { > > > > > > if (swap_duplicate(entry) < 0) > > > > > > - return entry.val; > > > + return -EAGAIN; > > > > > > /* make sure dst_mm is on swapoff's mmlist. */ > > > if (unlikely(list_empty(&dst_mm->mmlist))) { > > > > > > @@ -974,11 +974,13 @@ copy_pte_range(struct vm_area_struct *dst_vma, > > > struct vm_area_struct *src_vma,> > > > continue; > > > > > > } > > > if (unlikely(!pte_present(*src_pte))) { > > > > > > - entry.val = copy_nonpresent_pte(dst_mm, src_mm, > > > - dst_pte, src_pte, > > > - src_vma, addr, rss); > > > - if (entry.val) > > > + ret = copy_nonpresent_pte(dst_mm, src_mm, > > > + dst_pte, src_pte, > > > + src_vma, addr, rss); > > > + if (ret == -EAGAIN) { > > > + entry = pte_to_swp_entry(*src_pte); > > > > > > break; > > > > > > + } > > > > > > progress += 8; > > > continue; > > > > > > } > > > > Note that -EAGAIN was previously used by copy_present_page() for early cow > > use. Here later although we check entry.val first: > > > > if (entry.val) { > > if (add_swap_count_continuation(entry, GFP_KERNEL) < 0) { > > ret = -ENOMEM; > > goto out; > > } > > entry.val = 0; > > } else if (ret) { > > WARN_ON_ONCE(ret != -EAGAIN); > > prealloc = page_copy_prealloc(src_mm, src_vma, addr); > > if (!prealloc) > > return -ENOMEM; > > /* We've captured and resolved the error. Reset, try again. > > */ ret = 0; > > } > > > > We didn't reset "ret" in entry.val case (maybe we should?). Then in the next > > round of "goto again" if "ret" is unluckily untouched, it could reach the > > 2nd if check, and I think it could cause an unexpected > > page_copy_prealloc(). > > Thanks, I had considered that but saw "ret" was always set either by > copy_nonpresent_pte() or copy_present_pte(). However missed the "unlucky" case > at the start of the loop: > > if (progress >= 32) { > progress = 0; > if (need_resched() || > spin_needbreak(src_ptl) || pin_needbreak(dst_ptl)) > break; > > Looking at this again though checking different variables to figure out what > to do outside the locks and reusing error codes seems error prone. I reused - > EAGAIN for copy_nonpresent_pte() simply because that seemed the most sensible > error code, but I don't think that aids readability and it might be better to > use a unique error code for each case needing extra handling. > > So it might be better if I update this patch to: > 1) Use unique error codes for each case requiring special handling outside the > lock. > 2) Only check "ret" to determine what to do outside locks (ie. not entry.val) > 3) Document these. > 4) Always reset ret after handling. > > Thoughts? Looks good to me. Thanks, -- Peter Xu