From patchwork Wed Mar 24 08:21:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 12160469 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D635C433DB for ; Wed, 24 Mar 2021 08:21:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E2FE4619B6 for ; Wed, 24 Mar 2021 08:21:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2FE4619B6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 397B66B027B; Wed, 24 Mar 2021 04:21:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 31F926B027C; Wed, 24 Mar 2021 04:21:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1997F6B027E; Wed, 24 Mar 2021 04:21:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0119.hostedemail.com [216.40.44.119]) by kanga.kvack.org (Postfix) with ESMTP id EB9496B027B for ; Wed, 24 Mar 2021 04:21:33 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8C425180ACC2C for ; Wed, 24 Mar 2021 08:21:33 +0000 (UTC) X-FDA: 77954073666.03.F4D3657 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 66704FA for ; Wed, 24 Mar 2021 08:21:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616574091; 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; bh=jAgNsK9devgKzZZEmPPhrqr8dUdGVfpvAFbi2fl9vfk=; b=NmboLgxF+F3wj/sQf4Htv0b+KS6ipMsBGWmX7HuDaMmXCFaAzbh1laZoENnWbcZAd9kQDS RTEamKQI8hbzhgISkALcaQqlvNGg8Ixd6hZcXQ1LXGy0iwVnhiwwOLlBx8j9e0+GpHCH3G Irhk2Qf1IOk5XC5VyzoadCLSgW9iVNs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-358-QjT4gwMxNvWA814f-aWyuQ-1; Wed, 24 Mar 2021 04:21:27 -0400 X-MC-Unique: QjT4gwMxNvWA814f-aWyuQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42F77100746C; Wed, 24 Mar 2021 08:21:26 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-112-58.rdu2.redhat.com [10.10.112.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7C6A6E6FD; Wed, 24 Mar 2021 08:21:21 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 To: torvalds@linux-foundation.org cc: dhowells@redhat.com, "Matthew Wilcox (Oracle)" , Christoph Hellwig , linux-cachefs@redhat.com, linux-afs@lists.infradead.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] cachefiles, afs: mm wait fixes MIME-Version: 1.0 Content-ID: <2813136.1616574054.1@warthog.procyon.org.uk> From: David Howells Date: Wed, 24 Mar 2021 08:21:21 +0000 Message-ID: <2813194.1616574081@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Stat-Signature: 4ej3ijzarx49g3uxrihe4s761dnba1w1 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 66704FA Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf20; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=170.10.133.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616574091-13166 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: Hi Linus, Could you pull these patches from Matthew Wilcox to fix page waiting-related issues in cachefiles and afs as extracted from his folio series[1]: (1) In cachefiles, remove the use of the wait_bit_key struct to access something that's actually in wait_page_key format. The proper struct is now available in the header, so that should be used instead. (2) Add a proper wait function for waiting killably on the page writeback flag. This includes a recent bugfix[2] that's not in the afs code. (3) In afs, use the function added in (2) rather than using wait_on_page_bit_killable() which doesn't provide the aforementioned bugfix. Notes: - I've included these together since they are an excerpt from a patch series of Willy's, but I can send the first separately from the other two if you'd prefer since they touch different modules. - The cachefiles patch could be deferred to the next merge window as whichever compiler is used probably *should* generate the same code for both structs, even with struct randomisation turned on. - AuriStor (auristor.com) have added certain of my branches to their automated AFS testing, hence the Tested-by kafs-testing@auristor.com tag on the patches in this set. Is this the best way to represent this? David Link: https://lore.kernel.org/r/20210320054104.1300774-1-willy@infradead.org[1] Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c2407cf7d22d0c0d94cf20342b3b8f06f1d904e7 [2] Link: https://lore.kernel.org/r/20210323120829.GC1719932@casper.infradead.org/ # v1 --- The following changes since commit 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b: Linux 5.12-rc4 (2021-03-21 14:56:43 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/afs-cachefiles-fixes-20210323 for you to fetch changes up to 75b69799610c2b909a18e709c402923ea61aedc0: afs: Use wait_on_page_writeback_killable (2021-03-23 20:54:37 +0000) ---------------------------------------------------------------- cachefiles, afs: mm wait fixes ---------------------------------------------------------------- Matthew Wilcox (Oracle) (3): fs/cachefiles: Remove wait_bit_key layout dependency mm/writeback: Add wait_on_page_writeback_killable afs: Use wait_on_page_writeback_killable fs/afs/write.c | 3 +-- fs/cachefiles/rdwr.c | 7 +++---- include/linux/pagemap.h | 2 +- mm/page-writeback.c | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 7 deletions(-)