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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E9A6C4332F for ; Mon, 30 May 2022 18:29:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242653AbiE3S3m (ORCPT ); Mon, 30 May 2022 14:29:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242738AbiE3S3l (ORCPT ); Mon, 30 May 2022 14:29:41 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1D65D60D9A for ; Mon, 30 May 2022 11:29:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653935378; 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=+ALrzFnb0YEuDamJlOSrZjOy/DY+2J0hn9MNRn5A9C4=; b=MWCMyyjKq+nRsU1/E2gQwxH46wgLGr/ocdisVFG0vLsWPtOiumnskJ2064A5WnrOgrTAZJ 2gtTHxcY1TmLno+4FOSlws0frcW0tkSZ2i9Y3zUw043tBhAPIixFMz3pBN4P9KZ/7bnoN7 MMNOZpVOn2ePwNiCaXI2tfxkHSc9+EI= Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-221-ymgvbSqlOImX3JMfwut2Jg-1; Mon, 30 May 2022 14:29:37 -0400 X-MC-Unique: ymgvbSqlOImX3JMfwut2Jg-1 Received: by mail-il1-f197.google.com with SMTP id j5-20020a922005000000b002d1c2659644so8775012ile.8 for ; Mon, 30 May 2022 11:29:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=+ALrzFnb0YEuDamJlOSrZjOy/DY+2J0hn9MNRn5A9C4=; b=DaBPuA3OiJDS5kj0BISbtUHVdnJ8vR4b3aO/+C8ZsT7MA5PLvrWCVg2J++ers36d0T 31OFuWCOpKHGISb452/RMaLxBdueDkTimfz3ywCm0COTmibqYaEM7qPWjNUT9TFiTAx4 tLv9F6XzVK8vKIUmZHel/E5CNRGAyeWt5FGGsGYXCGwpuy++RahlMpXR0ufFTcqSO0Gb RVYrYPJcBJ3q3Et6OWStnr8Euj5MaUorCavPlItjfYxXoRhaJFE7R2USY3VgoD87LrpE YqNuxV6vmWYfgAkzugRyheuSYYaprGJ0Qh5sXgKID41kSjJE0Mf974wdJYneZ/MkuEGs u/yg== X-Gm-Message-State: AOAM530QG5NYcevnvyY5/BGoRGT/+TPhJhaiR927wgRZH/5+6EQuG+bE np/WVtH6isj50uuTFWX/f61jiujJb68GrJhyKYzcXS5fCScbOk+7kHr7eW2ea7CrxhhZ7af7pqC hj5JdzSIlGXOF/ug90FROBw== X-Received: by 2002:a92:d785:0:b0:2d1:7ce6:b834 with SMTP id d5-20020a92d785000000b002d17ce6b834mr25171865iln.207.1653935377084; Mon, 30 May 2022 11:29:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3wrc9ZuPCRdn+Dbnr8a7+sDY/SXALiOk3qZ3Cm9Rs8SSVa+bj9UHR0EABkWjwoIvWxsPXBw== X-Received: by 2002:a92:d785:0:b0:2d1:7ce6:b834 with SMTP id d5-20020a92d785000000b002d17ce6b834mr25171841iln.207.1653935376794; Mon, 30 May 2022 11:29:36 -0700 (PDT) Received: from xz-m1.local (cpec09435e3e0ee-cmc09435e3e0ec.cpe.net.cable.rogers.com. [99.241.198.116]) by smtp.gmail.com with ESMTPSA id cn9-20020a0566383a0900b003313b7a5731sm183095jab.178.2022.05.30.11.29.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 11:29:36 -0700 (PDT) Date: Mon, 30 May 2022 14:29:31 -0400 From: Peter Xu To: Heiko Carstens Cc: Christian Borntraeger , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Will Deacon , Matt Turner , linux-s390@vger.kernel.org, Andrew Morton , Brian Cain , Borislav Petkov , linux-alpha@vger.kernel.org, Alistair Popple , Jonas Bonn , linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, Michael Ellerman , Stefan Kristiansson , linux-snps-arc@lists.infradead.org, Vineet Gupta , Vasily Gorbik , Vlastimil Babka , Ivan Kokshaysky , Rich Felker , sparclinux@vger.kernel.org, Russell King , David Hildenbrand , Benjamin Herrenschmidt , Nicholas Piggin , "James E . J . Bottomley" , linux-xtensa@linux-xtensa.org, linux-sh@vger.kernel.org, Paul Walmsley , linux-m68k@lists.linux-m68k.org, linuxppc-dev@lists.ozlabs.org, Richard Henderson , Guo Ren , linux-parisc@vger.kernel.org, Andrea Arcangeli , Helge Deller , Al Viro , Albert Ou , linux-um@lists.infradead.org, "H . Peter Anvin" , Janosch Frank , Sven Schnelle , Anton Ivanov , openrisc@lists.librecores.org, Thomas Bogendoerfer , linux-hexagon@vger.kernel.org, Andy Lutomirski , Stafford Horne , linux-csky@vger.kernel.org, Thomas Gleixner , linux-mips@vger.kernel.org, Paul Mackerras , Alexander Gordeev , Dinh Nguyen , Palmer Dabbelt , "David S . Miller" , Johannes Weiner , Hugh Dickins , Ingo Molnar , Peter Zijlstra , linux-riscv@lists.infradead.org, Max Filippov , Catalin Marinas , Geert Uytterhoeven , Johannes Berg , Chris Zankel , Michal Simek , x86@kernel.org, Yoshinori Sato , Dave Hansen , Richard Weinberger , Ingo Molnar Subject: Re: [PATCH v4] mm: Avoid unnecessary page fault retires on shared memory types Message-ID: References: <20220527193936.30678-1-peterx@redhat.com> <33fd4731-9765-d78b-bdc3-f8243c98e81f@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On Mon, May 30, 2022 at 07:03:31PM +0200, Heiko Carstens wrote: > On Mon, May 30, 2022 at 12:00:52PM -0400, Peter Xu wrote: > > On Mon, May 30, 2022 at 11:52:54AM -0400, Peter Xu wrote: > > > On Mon, May 30, 2022 at 11:35:10AM +0200, Christian Borntraeger wrote: > > > > > diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c > > > > > index 4608cc962ecf..e1d40ca341b7 100644 > > > > > --- a/arch/s390/mm/fault.c > > > > > +++ b/arch/s390/mm/fault.c > > > > > @@ -436,12 +436,11 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access) > > > > > /* The fault is fully completed (including releasing mmap lock) */ > > > > > if (fault & VM_FAULT_COMPLETED) { > > > > > - /* > > > > > - * Gmap will need the mmap lock again, so retake it. TODO: > > > > > - * only conditionally take the lock when CONFIG_PGSTE set. > > > > > - */ > > > > > - mmap_read_lock(mm); > > > > > - goto out_gmap; > > > > > + if (gmap) { > > > > > + mmap_read_lock(mm); > > > > > + goto out_gmap; > > > > > + } > fault = 0; <---- > > > > > + goto out; > > > > Hmm, right after I replied I found "goto out" could be problematic, since > > all s390 callers of do_exception() will assume it an error condition (side > > note: "goto out_gmap" contains one step to clear "fault" to 0). I'll > > replace this with "return 0" instead if it looks good to both of you. > > > > I'll wait for a confirmation before reposting. Thanks, > > Right, that was stupid. Thanks for double checking! > > However could you please add "fault = 0" just in front of the goto out > like above? I'd like to avoid having returns and gotos mixed. Sure thing. -- Peter Xu