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 X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 5E01AC433DF for ; Sat, 22 Aug 2020 11:31:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1B84520738 for ; Sat, 22 Aug 2020 11:31:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FHhWGsCZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B84520738 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 829C16B00A3; Sat, 22 Aug 2020 07:31:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B2666B00A5; Sat, 22 Aug 2020 07:31:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67A938D0008; Sat, 22 Aug 2020 07:31:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id 4E22C6B00A3 for ; Sat, 22 Aug 2020 07:31:16 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 10C7F3631 for ; Sat, 22 Aug 2020 11:31:16 +0000 (UTC) X-FDA: 77177988552.11.fire31_2e0cf7227041 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 1551C180F982C for ; Sat, 22 Aug 2020 11:31:09 +0000 (UTC) X-HE-Tag: fire31_2e0cf7227041 X-Filterd-Recvd-Size: 7013 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Sat, 22 Aug 2020 11:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598095867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=NcFdFa4MMpt7rkCCPB7Hpg+82oA9hMXlLxd78N6AXZU=; b=FHhWGsCZmoCXJU853MZpBrFKPLDxfhOVFAJfUObvNrTV49GDwm3cW3sqG3ufWUZLM6qcCV NdXFVggIhQxUpZ3Mq9iju1/z6lZzp4nDO2Gn+z/vu+cfAI80oo0RYQpa8jhsD5mIhcXi9y rWiOc0C0LsHx6oRpMUKX3ynpc61BGEc= Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-19-F-x_Y99qOHi4AILBf7gGIA-1; Sat, 22 Aug 2020 07:31:04 -0400 X-MC-Unique: F-x_Y99qOHi4AILBf7gGIA-1 Received: by mail-pl1-f198.google.com with SMTP id p24so2656195plr.23 for ; Sat, 22 Aug 2020 04:31:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NcFdFa4MMpt7rkCCPB7Hpg+82oA9hMXlLxd78N6AXZU=; b=VraOHHEk27QxtPcC2nqz8lfjeZce7vYpuZU1dKiOAwFphn47jqi30wFJ70Eu0ODMhd Zv/EF8DZ7hkqzgAnzDJsB9EsUyq1Cqpux61DQvzsgHyUkYE+Kjx4aqjhiTqj6B9RbbRt FDsBgR/k1YYThNGzzswbX/ZXSE7jv9N1zgORDYMZ/4TmGzhv3QryVX2903b48DSzW3Fd QZCCqOCO99+262K9Xl0yeHxWi0+r0yGljg4MVaKLsFzY9TJmQ9CNooEvSagBrkZaZfXK ipEGiJvvHJQ40OxaodXJ0TzXkcn/OvSmqkbMNnlAlJBkt6DSsJd/JCAG1eBFizaoqufF cGCg== X-Gm-Message-State: AOAM532sJDw4sVrXnpCaZaQMVcIc/FRVDJSfBXZtBstoimhBghgIOU9J +o4vQpKO2YFR9hBkbR6QXXK8FcSdtNkB5lN6M1/QJ9ZAHEHXPXlIearWwbuo2clRV2qDtkItXd+ N5Zx5xtcYwJQ= X-Received: by 2002:a17:902:a70c:: with SMTP id w12mr5970807plq.80.1598095863437; Sat, 22 Aug 2020 04:31:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyknFIUUSICFQyobsoC9jxZ9OXJzJyyuJ74KZ+5Bi0JtP+TB0rc+KNGkjuZsIyh/FfzDoAEAg== X-Received: by 2002:a17:902:a70c:: with SMTP id w12mr5970789plq.80.1598095863120; Sat, 22 Aug 2020 04:31:03 -0700 (PDT) Received: from xiangao.remote.csb ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id d131sm3981066pgc.88.2020.08.22.04.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Aug 2020 04:31:02 -0700 (PDT) From: Gao Xiang To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox , Gao Xiang Subject: [PATCH v2 rebased] swap: rename SWP_FS to SWAP_FS_OPS to avoid ambiguity Date: Sat, 22 Aug 2020 19:30:19 +0800 Message-Id: <20200822113019.11319-1-hsiangkao@redhat.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20200822090208.24212-1-hsiangkao@redhat.com> References: <20200822090208.24212-1-hsiangkao@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hsiangkao@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 1551C180F982C X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: SWP_FS is used to make swap_{read,write}page() go through the filesystem, and it's only used for swap files over NFS for now. Otherwise it will directly submit IO to blockdev according to swapfile extents reported by filesystems in advance. As Matthew pointed out [1], SWP_FS naming is somewhat confusing, so let's rename to SWP_FS_OPS. [1] https://lore.kernel.org/r/20200820113448.GM17456@casper.infradead.org Suggested-by: Matthew Wilcox Signed-off-by: Gao Xiang --- v2: resolve conflicts with recent merged: commit 7b37e22675df ("mm/page_io: mark various intentional data races") include/linux/swap.h | 2 +- mm/page_io.c | 6 +++--- mm/swap_state.c | 2 +- mm/swapfile.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 661046994db4..df7ce24bbd8f 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -170,7 +170,7 @@ enum { SWP_CONTINUED = (1 << 5), /* swap_map has count continuation */ SWP_BLKDEV = (1 << 6), /* its a block device */ SWP_ACTIVATED = (1 << 7), /* set after swap_activate success */ - SWP_FS = (1 << 8), /* swap file goes through fs */ + SWP_FS_OPS = (1 << 8), /* swapfile operations go through fs */ SWP_AREA_DISCARD = (1 << 9), /* single-time swap area discards */ SWP_PAGE_DISCARD = (1 << 10), /* freed swap page-cluster discards */ SWP_STABLE_WRITES = (1 << 11), /* no overwrite PG_writeback pages */ diff --git a/mm/page_io.c b/mm/page_io.c index e485a6e8a6cd..dc6de6962612 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -302,7 +302,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc, struct swap_info_struct *sis = page_swap_info(page); VM_BUG_ON_PAGE(!PageSwapCache(page), page); - if (data_race(sis->flags & SWP_FS)) { + if (data_race(sis->flags & SWP_FS_OPS)) { struct kiocb kiocb; struct file *swap_file = sis->swap_file; struct address_space *mapping = swap_file->f_mapping; @@ -393,7 +393,7 @@ int swap_readpage(struct page *page, bool synchronous) goto out; } - if (data_race(sis->flags & SWP_FS)) { + if (data_race(sis->flags & SWP_FS_OPS)) { struct file *swap_file = sis->swap_file; struct address_space *mapping = swap_file->f_mapping; @@ -455,7 +455,7 @@ int swap_set_page_dirty(struct page *page) { struct swap_info_struct *sis = page_swap_info(page); - if (data_race(sis->flags & SWP_FS)) { + if (data_race(sis->flags & SWP_FS_OPS)) { struct address_space *mapping = sis->swap_file->f_mapping; VM_BUG_ON_PAGE(!PageSwapCache(page), page); diff --git a/mm/swap_state.c b/mm/swap_state.c index c16eebb81d8b..7f9449bbffdb 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -631,7 +631,7 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask, goto skip; /* Test swap type to make sure the dereference is safe */ - if (likely(si->flags & (SWP_BLKDEV | SWP_FS))) { + if (likely(si->flags & (SWP_BLKDEV | SWP_FS_OPS))) { struct inode *inode = si->swap_file->f_mapping->host; if (inode_read_congested(inode)) goto skip; diff --git a/mm/swapfile.c b/mm/swapfile.c index debc94155f74..5ba58ee1b378 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2433,7 +2433,7 @@ static int setup_swap_extents(struct swap_info_struct *sis, sector_t *span) if (ret >= 0) sis->flags |= SWP_ACTIVATED; if (!ret) { - sis->flags |= SWP_FS; + sis->flags |= SWP_FS_OPS; ret = add_swap_extent(sis, 0, sis->max, 0); *span = sis->pages; } -- 2.18.1