Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Roman Gushchin <guro@fb.com>
To:     Anshuman Khandual <anshuman.khandual@arm.com>
CC:     Andrew Morton <akpm@linux-foundation.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Kernel Team <Kernel-team@fb.com>,
        "Johannes Weiner" <hannes@cmpxchg.org>,
        Matthew Wilcox <willy@infradead.org>,
        Vlastimil Babka <vbabka@suse.cz>
Subject: Re: [PATCH] mm: refactor __vunmap() to avoid duplicated call to
 find_vm_area()
Thread-Topic: [PATCH] mm: refactor __vunmap() to avoid duplicated call to
 find_vm_area()
Thread-Index: AQHVCq//khAEDBlALkSFD6zmmU+RfaZrzesAgACg2oA=
Date:   Wed, 15 May 2019 17:17:33 +0000
Message-ID: <20190515171729.GC9307@castle>
References: <20190514235111.2817276-1-guro@fb.com>
 <7ad2b16d-c1a3-b826-df4d-6d9ed1d9fc9f@arm.com>
In-Reply-To: <7ad2b16d-c1a3-b826-df4d-6d9ed1d9fc9f@arm.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [2620:10d:c090:180::779]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 78ee93fc-5ba2-465e-eecd-08d6d959380d
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(2017052603328)(7193020);SRVR:BYAPR15MB3272;
x-ms-traffictypediagnostic: BYAPR15MB3272:
x-ms-exchange-purlcount: 1
x-microsoft-antispam-prvs: <BYAPR15MB32721773590000F06149BE36BE090@BYAPR15MB3272.namprd15.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:6108;
x-forefront-prvs: 0038DE95A2
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(7916004)(396003)(136003)(39860400002)(366004)(376002)(346002)(189003)(199004)(71190400001)(71200400001)(6116002)(86362001)(1076003)(2906002)(33716001)(256004)(14444005)(5660300002)(6916009)(53936002)(305945005)(7736002)(4326008)(25786009)(66476007)(64756008)(6306002)(52116002)(102836004)(386003)(6246003)(68736007)(316002)(8936002)(81156014)(81166006)(486006)(54906003)(46003)(11346002)(446003)(476003)(14454004)(478600001)(99286004)(966005)(186003)(6506007)(76176011)(53546011)(229853002)(6436002)(8676002)(6486002)(66556008)(73956011)(66446008)(66946007)(6512007)(9686003)(33656002)(37363001);DIR:OUT;SFP:1102;SCL:1;SRVR:BYAPR15MB3272;H:BYAPR15MB2631.namprd15.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: fb.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: vg3BzHvxkPXFjgIqSEWTEWzw+8MlX5xUwCYvsuInvLQfXx+/XVVscPghTPTch3GHsda0ll4OToxi2aCY3JJVhc3JeqaBGfRctXbz21+K9sWPHh2GlXNiYDMlVJbuwMcSRtfhthOdx2waa8KnzMp9t6WLBrhgXEgETgRrRiPfvuVrLYZLGslGhY8XRGsAxn1jYGfFESRqm9iSU9uyHOQjeJ+KoCeqozrsIyl0r9TTzgZIh7HEH8+5b7SigLRNvPgwctR9STTOnWafT1sfXRFlJh7jrTWBoP8rmKrIUCiKzqqws5eTg54h2SI98zYAne1dZz+IUCU6ViBpzDczIrtjJEHV0ML7ycRHBpxH04y9TBZpPAxUNz3d6I1piNGvAD63CXQYT9tsSVpCv1KRMktImcqs0l0cx8pqb9D2p29EuHo=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <315A17B3378CFB4999879700E65EF6B5@namprd15.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 78ee93fc-5ba2-465e-eecd-08d6d959380d
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 May 2019 17:17:33.8955
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB3272
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-05-15_11:,,
 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501
 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0
 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0
 mlxlogscore=495 adultscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.0.1-1810050000 definitions=main-1905150104
X-FB-Internal: deliver
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, May 15, 2019 at 01:11:46PM +0530, Anshuman Khandual wrote:
>=20
>=20
> On 05/15/2019 05:21 AM, Roman Gushchin wrote:
> > __vunmap() calls find_vm_area() twice without an obvious reason:
> > first directly to get the area pointer, second indirectly by calling
> > vm_remove_mappings()->remove_vm_area(), which is again searching
> > for the area.
> >=20
> > To remove this redundancy, let's split remove_vm_area() into
> > __remove_vm_area(struct vmap_area *), which performs the actual area
> > removal, and remove_vm_area(const void *addr) wrapper, which can
> > be used everywhere, where it has been used before. Let's pass
> > a pointer to the vm_area instead of vm_struct to vm_remove_mappings(),
> > so it can pass it to __remove_vm_area() and avoid the redundant area
> > lookup.
> >=20
> > On my test setup, I've got 5-10% speed up on vfree()'ing 1000000
> > of 4-pages vmalloc blocks.
> >=20
> > Perf report before:
> >   29.44%  cat      [kernel.kallsyms]  [k] free_unref_page
> >   11.88%  cat      [kernel.kallsyms]  [k] find_vmap_area
> >    9.28%  cat      [kernel.kallsyms]  [k] __free_pages
> >    7.44%  cat      [kernel.kallsyms]  [k] __slab_free
> >    7.28%  cat      [kernel.kallsyms]  [k] vunmap_page_range
> >    4.56%  cat      [kernel.kallsyms]  [k] __vunmap
> >    3.64%  cat      [kernel.kallsyms]  [k] __purge_vmap_area_lazy
> >    3.04%  cat      [kernel.kallsyms]  [k] __free_vmap_area
> >=20
> > Perf report after:
> >   32.41%  cat      [kernel.kallsyms]  [k] free_unref_page
> >    7.79%  cat      [kernel.kallsyms]  [k] find_vmap_area
> >    7.40%  cat      [kernel.kallsyms]  [k] __slab_free
> >    7.31%  cat      [kernel.kallsyms]  [k] vunmap_page_range
> >    6.84%  cat      [kernel.kallsyms]  [k] __free_pages
> >    6.01%  cat      [kernel.kallsyms]  [k] __vunmap
> >    3.98%  cat      [kernel.kallsyms]  [k] smp_call_function_single
> >    3.81%  cat      [kernel.kallsyms]  [k] __purge_vmap_area_lazy
> >    2.77%  cat      [kernel.kallsyms]  [k] __free_vmap_area
> >=20
> > Signed-off-by: Roman Gushchin <guro@fb.com>
> > Cc: Johannes Weiner <hannes@cmpxchg.org>
> > Cc: Matthew Wilcox <willy@infradead.org>
> > Cc: Vlastimil Babka <vbabka@suse.cz>
> > ---
> >  mm/vmalloc.c | 52 +++++++++++++++++++++++++++++-----------------------
> >  1 file changed, 29 insertions(+), 23 deletions(-)
> >=20
> > diff --git a/mm/vmalloc.c b/mm/vmalloc.c
> > index c42872ed82ac..8d4907865614 100644
> > --- a/mm/vmalloc.c
> > +++ b/mm/vmalloc.c
> > @@ -2075,6 +2075,22 @@ struct vm_struct *find_vm_area(const void *addr)
> >  	return NULL;
> >  }
> > =20
> > +static struct vm_struct *__remove_vm_area(struct vmap_area *va)
> > +{
> > +	struct vm_struct *vm =3D va->vm;
> > +
> > +	spin_lock(&vmap_area_lock);
> > +	va->vm =3D NULL;
> > +	va->flags &=3D ~VM_VM_AREA;
> > +	va->flags |=3D VM_LAZY_FREE;
> > +	spin_unlock(&vmap_area_lock);
> > +
> > +	kasan_free_shadow(vm);
> > +	free_unmap_vmap_area(va);
> > +
> > +	return vm;
> > +}
> > +
> >  /**
> >   * remove_vm_area - find and remove a continuous kernel virtual area
> >   * @addr:	    base address
> > @@ -2087,26 +2103,14 @@ struct vm_struct *find_vm_area(const void *addr=
)
> >   */
> >  struct vm_struct *remove_vm_area(const void *addr)
> >  {
> > +	struct vm_struct *vm =3D NULL;
> >  	struct vmap_area *va;
> > =20
> > -	might_sleep();
>=20
> Is not this necessary any more ?

We've discussed it here: https://lkml.org/lkml/2019/4/17/1098 .
Tl;dr it's not that useful.

>=20
> > -
> >  	va =3D find_vmap_area((unsigned long)addr);
> > -	if (va && va->flags & VM_VM_AREA) {
> > -		struct vm_struct *vm =3D va->vm;
> > -
> > -		spin_lock(&vmap_area_lock);
> > -		va->vm =3D NULL;
> > -		va->flags &=3D ~VM_VM_AREA;
> > -		va->flags |=3D VM_LAZY_FREE;
> > -		spin_unlock(&vmap_area_lock);
> > -
> > -		kasan_free_shadow(vm);
> > -		free_unmap_vmap_area(va);
> > +	if (va && va->flags & VM_VM_AREA)
> > +		vm =3D __remove_vm_area(va);
> > =20
> > -		return vm;
> > -	}
> > -	return NULL;
> > +	return vm;
> >  }
>=20
> Other callers of remove_vm_area() cannot use __remove_vm_area() directly =
as well
> to save a look up ?
>=20

I'll take a look. Good idea, thanks!

Roman