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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 047C9C433F5 for ; Thu, 16 Sep 2021 21:58:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B20EB610C7 for ; Thu, 16 Sep 2021 21:58:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B20EB610C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 292E5940007; Thu, 16 Sep 2021 17:58:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 242A66B0072; Thu, 16 Sep 2021 17:58:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 130F6940007; Thu, 16 Sep 2021 17:58:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id 058486B0071 for ; Thu, 16 Sep 2021 17:58:45 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B580B180CF0CA for ; Thu, 16 Sep 2021 21:58:44 +0000 (UTC) X-FDA: 78594801768.14.8023E27 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 757D1F00009D for ; Thu, 16 Sep 2021 21:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631829524; 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=p2nOnT/BtxTSAXpnqdHXN1Y4k+CMsYKb4beYByvY8jY=; b=gT8+ZCw5Nc8fhhzAIb0idvUXrp3m5+IQBRLJxU2r6GMzMqHR40rX8bjH4ertTdAlFKOPLS W7Z0syH4J6AoX8MXopZ3i9wPyPti8uZ1lcuBdyLUWEO0+b2Qzf4Abe2/8wFeSlJbel8joj WeamnUKdOTqZla81rgBLH1B81jEj3a4= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-341-WHMc8oEUPKGAdi-DJiK-Uw-1; Thu, 16 Sep 2021 17:58:42 -0400 X-MC-Unique: WHMc8oEUPKGAdi-DJiK-Uw-1 Received: by mail-qt1-f199.google.com with SMTP id n19-20020ac81e13000000b0029f679691eeso74126433qtl.20 for ; Thu, 16 Sep 2021 14:58:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=p2nOnT/BtxTSAXpnqdHXN1Y4k+CMsYKb4beYByvY8jY=; b=2Ij0yET/i/+PiNRUW/bYluGKM8twcUTr0a8s8AD7paFm9EX9K8xkgBHsi22c3firf3 V78VkTEGNfaT04tYjf+tS0MdFbMQksOV1bINikpJfymbOdG9lXYxfKIMm3TgE8tD1rjX 1EuioWJ7oh4QuDiDiY1HMLAm5aKS3YSA3j2IZsK3i3igsghNEAcC57rPPr/gApxZhF4O /3htQZLRFFDwrvkHmktEPjaE+FiElWxG00KfPKl2G2Bdbk34iRYWiSmN/19tGQxH1KCv TkCItraKDIaIqXS9fkBR2IWZu2bhQev4Hp9if4m4bA23ZfSGjIHx7810eiFDd8YMN2rp WK/w== X-Gm-Message-State: AOAM531oeoSDuE18JTPlc4bJu4ucnFAfIgvVSG9NCFBZjFOXWn+VfxXx xHKXHR7dF2JNVVr/TLtF8NuQPtZEi9/8UYIfZhkYRqe4vu43BY3Bid43cS8wdXir/kUYGZjfD8E 9T5uYKU5cejimNlR1zpsx3wYEz67pO0hyhMnrwE7usiP7huTy5+lBc3JfekHB X-Received: by 2002:a37:e409:: with SMTP id y9mr5981403qkf.441.1631829521940; Thu, 16 Sep 2021 14:58:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhfdGFXrqy/ukybe2LuApn40ildbDdIpxxhJNlm1xp8LfoJMi0CKvrlurNql13VHOqdn1FaQ== X-Received: by 2002:a37:e409:: with SMTP id y9mr5981383qkf.441.1631829521661; Thu, 16 Sep 2021 14:58:41 -0700 (PDT) Received: from t490s.redhat.com ([2607:fea8:56a2:9100::d35a]) by smtp.gmail.com with ESMTPSA id c7sm2990832qtv.9.2021.09.16.14.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 14:58:41 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: peterx@redhat.com, Andrew Morton , Vlastimil Babka , Hugh Dickins Subject: [PATCH] mm/smaps: Use vma->vm_pgoff directly when counting partial swap Date: Thu, 16 Sep 2021 17:58:39 -0400 Message-Id: <20210916215839.95177-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 757D1F00009D Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gT8+ZCw5; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf16.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=peterx@redhat.com X-Stat-Signature: h17gzhpcg4417fsprrgw1fadrdudzgf8 X-HE-Tag: 1631829524-192258 Content-Transfer-Encoding: quoted-printable 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: linear_page_index(vma, vma->vm_start) of a shmem vma is exactly vm_pgoff. Cc: Vlastimil Babka Cc: Hugh Dickins Signed-off-by: Peter Xu --- mm/shmem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 96ccf6e941aa..2aef5b8e17c9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -856,8 +856,7 @@ unsigned long shmem_swap_usage(struct vm_area_struct = *vma) return swapped << PAGE_SHIFT; =20 /* Here comes the more involved part */ - return shmem_partial_swap_usage(mapping, - linear_page_index(vma, vma->vm_start), + return shmem_partial_swap_usage(mapping, vma->vm_pgoff, linear_page_index(vma, vma->vm_end)); } =20 --=20 2.31.1