From patchwork Wed Nov 21 21:54:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 10693185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 33F181709 for ; Wed, 21 Nov 2018 21:54:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 192202864F for ; Wed, 21 Nov 2018 21:54:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D7E52CA2E; Wed, 21 Nov 2018 21:54:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94BF52864F for ; Wed, 21 Nov 2018 21:54:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 930AD6B27C4; Wed, 21 Nov 2018 16:54:48 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8DFC16B27C5; Wed, 21 Nov 2018 16:54:48 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7CF5F6B27C6; Wed, 21 Nov 2018 16:54:48 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-it1-f199.google.com (mail-it1-f199.google.com [209.85.166.199]) by kanga.kvack.org (Postfix) with ESMTP id 5639B6B27C4 for ; Wed, 21 Nov 2018 16:54:48 -0500 (EST) Received: by mail-it1-f199.google.com with SMTP id 71-v6so8614408itl.5 for ; Wed, 21 Nov 2018 13:54:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=L0Df52YKcoq8bv8YlNhyqk1lTtReHKRExwnYBZ1Z0Bo=; b=bDbdGgZlyqUrsvPsmtfXLYaElZcAqPyWZGI34WdtMRxv3hoIWybrWGa72UpQnjPLKd N5QBwmOpVM/vyAuLR9tBXlkzL1cAivNwXcEqWcaAOxxyRADi2cSr2K8+RgR51OMwsB0I qKchHk3ouUOhxF2taIzn/Od0wUNm2uflkgw6dLKOCtu6VI2uyTEZ3Tit6zMYAJKQPA0s uifijXVw8N1drzGz1KGGcvJ3xfFN9aZSVuWrbyCg2nu+GEAfNGqa8qTfOV1rBXbg0ZK/ kt1tu1wlmxxbQhZfqijivNBJOk4kcUWz8uB/h7XK7wLGyVJzGYd8Ogy8mXa8UD8tuRsG r0rg== X-Gm-Message-State: AGRZ1gIzSVzP72tVShNo8kzheaXIT2HlM9JfQkzSU/ApYBP7g4rYfUfh hNHlvfbbW7XgmKISV/jbjPw5Yu/NkiGA0nmDBCQYvSFPUqqKom6ADEN1x1Y2zB071xj7XDxajyA +2PxmfjWuTFRUxbmqs84FTKJL9KWA9+YSVArhIuFO9TwBYVAbML3rXhezLql0yValg59gCSrq5Y OumwUtXirrYFrWcokeKzlpWODZzB35Ll5ttHhNkc4pQwFhMSI7sT7ziKa/ttVnEWCFZ3aMTdf5y Khh3tbQDjQ2nNWl8I6Ow0m0jKS/1VGdVMWnkxIXJuLuYx8U86ylVLwgEv8KEbMkBp81lE88vNyj uEFXq9axdbQgI9VypaEEPFdsMWfwkUIA7O9u12UDLmDjRx6pmF4mtSF7geWlLBjOX1FsAx8d8Cd Y X-Received: by 2002:a24:7692:: with SMTP id z140-v6mr7391909itb.124.1542837288065; Wed, 21 Nov 2018 13:54:48 -0800 (PST) X-Received: by 2002:a24:7692:: with SMTP id z140-v6mr7391886itb.124.1542837287411; Wed, 21 Nov 2018 13:54:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542837287; cv=none; d=google.com; s=arc-20160816; b=WcnJHuQGuZ2uG2JgyMQTFBM0FyI7GGixLA42Jf0eEEXMN1S1S9bYsU/Kzuriw7ztcP VeKd5B/Gr1T+Jvo6u9SXZCngHd5RyJoHxjIqj+3qXkOmkZnc/+jfhYg4KLEhMnqJ7kgF czHs0IOUvsg34XHaQjJ3WSG0RJTCNqrckqgcoN2BEIg/W6y4J6ed9T3cvl0u6bb9SsqF qVZuQEKeHNJVjdmpKKF7FQKypN8KYa9amf5JZUqP98SZP2NX0Cw8ggqeHoD6ioslJmju a15OmnUbuGxq2Xy4sYLzflrCqK0k9Dq35euuryndsrMgyEV2opDwALIDCqtgql6zoePi zz/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=L0Df52YKcoq8bv8YlNhyqk1lTtReHKRExwnYBZ1Z0Bo=; b=lF3wmWjnqlGR0WejQVF2dCKH6ZbdAUwF4wnkfZ02k7RH7Y3lRu8hJQKLHc9KfWHViO smGItFXNY1Nk3ct0Jwzl6uMYfaJFejj7+s8MfmBaJQAwF0kpJ+iYcHO+27Tb9WaQJtSc nHkBN0Goq8WSD9m48gNmH0JBLcv7Ron2SUPRqocNPjgmTiy0tPHrRoJ5tXSgDEprTGmL m+U6Sue0CEgeiRisoXmKgE7PqL8B7my49L6tgCi61ow0qx6w52Oz4+UtYw5UOEadWxHD Rv9GtQRM1B1PXFGrFry2Rex/m2K83GIBU4/wI3gjE/tX+W+CrF38UHJ+UPqqhiWBcVXT bDzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=lPq1BygM; spf=pass (google.com: domain of yuzhao@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=yuzhao@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id g67sor15430804iof.86.2018.11.21.13.54.47 for (Google Transport Security); Wed, 21 Nov 2018 13:54:47 -0800 (PST) Received-SPF: pass (google.com: domain of yuzhao@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=lPq1BygM; spf=pass (google.com: domain of yuzhao@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=yuzhao@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L0Df52YKcoq8bv8YlNhyqk1lTtReHKRExwnYBZ1Z0Bo=; b=lPq1BygMDDfKlEgfu9t5zjgld8jO/q6ohZ7y2YIzgXHnpS9QnRVCZEdA8UHKLc6INm ySw8rsSsVB1u6L/ZuSOEqaXyr50CJZsL9Iv66mvLsHr1aKtivHFIBdxkyNr/VJ5kAPzI k4n0W5QDOEhEzMI8zUkaXT1H6OJCMKFoIjRgStb087DwGAXxvYJpErzSHG67r3kvujAe I+XX6P2sWEW8B3K0d9DzvjANuQv0oorGFjL5KGx+HY5E59FYT1Z5RHG+9NHNBJqVTWrQ zGMNUMu0zDPKMXWemdPNHfRMXSGOLkIsGDPYD24hXAlQxEyYZ8/XjK9RneoSlYSTwZRl lhRg== X-Google-Smtp-Source: AFSGD/XlPwzbOPnpdoXpFaLjuamJJqgfCZIssAtHHIqFKyT4Ic86RiAOvQH/uHDBapIyVwTR3Dxpdw== X-Received: by 2002:a6b:710b:: with SMTP id q11mr5448132iog.138.1542837286843; Wed, 21 Nov 2018 13:54:46 -0800 (PST) Received: from yuzhao.bld.corp.google.com ([2620:15c:183:0:a0c3:519e:9276:fc96]) by smtp.gmail.com with ESMTPSA id 142-v6sm1113716itw.40.2018.11.21.13.54.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 13:54:45 -0800 (PST) From: Yu Zhao To: Hugh Dickins Cc: Andrew Morton , Matthew Wilcox , stable@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao Subject: [PATCH v3] mm: use swp_offset as key in shmem_replace_page() Date: Wed, 21 Nov 2018 14:54:42 -0700 Message-Id: <20181121215442.138545-1-yuzhao@google.com> X-Mailer: git-send-email 2.19.1.1215.g8438c0b245-goog In-Reply-To: <20181119010924.177177-1-yuzhao@google.com> References: <20181119010924.177177-1-yuzhao@google.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP We changed key of swap cache tree from swp_entry_t.val to swp_offset. Need to do so in shmem_replace_page() as well. Fixes: f6ab1f7f6b2d ("mm, swap: use offset of swap entry as key of swap cache") Cc: stable@vger.kernel.org # v4.9+ Signed-off-by: Yu Zhao Reviewed-by: Matthew Wilcox Acked-by: Hugh Dickins --- mm/shmem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index d44991ea5ed4..42b70978e814 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1509,11 +1509,13 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp, { struct page *oldpage, *newpage; struct address_space *swap_mapping; + swp_entry_t entry; pgoff_t swap_index; int error; oldpage = *pagep; - swap_index = page_private(oldpage); + entry.val = page_private(oldpage); + swap_index = swp_offset(entry); swap_mapping = page_mapping(oldpage); /* @@ -1532,7 +1534,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp, __SetPageLocked(newpage); __SetPageSwapBacked(newpage); SetPageUptodate(newpage); - set_page_private(newpage, swap_index); + set_page_private(newpage, entry.val); SetPageSwapCache(newpage); /*