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=-13.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,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 E491AC433E1 for ; Wed, 24 Mar 2021 10:25:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8436261A07 for ; Wed, 24 Mar 2021 10:25:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8436261A07 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 E57286B02B6; Wed, 24 Mar 2021 06:25:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E30306B02B7; Wed, 24 Mar 2021 06:25:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C80A26B02B8; Wed, 24 Mar 2021 06:25:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id A3ECF6B02B6 for ; Wed, 24 Mar 2021 06:25:07 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 6D0A9A2A3 for ; Wed, 24 Mar 2021 10:25:07 +0000 (UTC) X-FDA: 77954385054.25.681CF42 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 28B05E0011DD for ; Wed, 24 Mar 2021 10:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616581505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hLr3oxEF1/9Rhj8o+UPHLCrvFG5XatLxuy2W9STTzPM=; b=GMAgQFoFt1RltsFR5cE9jXVsf/FyQDge8FbHrszlKQ8vIagBZwpx5UERAXXVXRhYtF5mmc vSNG110zCifRGXMBjVUvTPllJgZu1tq/OwB2EDDULrf94pinAOGnCP8JFBCcUKMlXo46Jp vujdXIlPxDC8zBKKPHl9kMYeDV601bA= 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-368-shSdeTk8O9ahfEpodI8hHw-1; Wed, 24 Mar 2021 06:25:01 -0400 X-MC-Unique: shSdeTk8O9ahfEpodI8hHw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D16DA81621; Wed, 24 Mar 2021 10:24:59 +0000 (UTC) Received: from t480s.redhat.com (ovpn-115-66.ams2.redhat.com [10.36.115.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id B6ECA10013D7; Wed, 24 Mar 2021 10:24:56 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Linus Torvalds , Greg Kroah-Hartman , Andrew Morton , Hillf Danton , Michal Hocko , Matthew Wilcox , Oleksiy Avramchenko , Steven Rostedt , Minchan Kim , huang ying Subject: [PATCH v1 3/3] mm/vmalloc: remove vwrite() Date: Wed, 24 Mar 2021 11:23:51 +0100 Message-Id: <20210324102351.6932-4-david@redhat.com> In-Reply-To: <20210324102351.6932-1-david@redhat.com> References: <20210324102351.6932-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 28B05E0011DD X-Stat-Signature: c7yrhrd1myxrx77b8rtuxb1j9jnrhhbx Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf30; 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: 1616581504-630384 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: The last user (/dev/kmem) is gone. Let's drop it. Cc: Linus Torvalds Cc: Greg Kroah-Hartman Cc: Andrew Morton Cc: Hillf Danton Cc: Michal Hocko Cc: Matthew Wilcox Cc: Oleksiy Avramchenko Cc: Steven Rostedt Cc: Minchan Kim Cc: huang ying Signed-off-by: David Hildenbrand --- include/linux/vmalloc.h | 1 - mm/nommu.c | 10 ---- mm/vmalloc.c | 116 +--------------------------------------- 3 files changed, 1 insertion(+), 126 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 390af680e916..9c1b17c7dd95 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -200,7 +200,6 @@ static inline void set_vm_flush_reset_perms(void *add= r) =20 /* for /proc/kcore */ extern long vread(char *buf, char *addr, unsigned long count); -extern long vwrite(char *buf, char *addr, unsigned long count); =20 /* * Internals. Dont't use.. diff --git a/mm/nommu.c b/mm/nommu.c index 5c9ab799c0e6..85a3a68dffb6 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -210,16 +210,6 @@ long vread(char *buf, char *addr, unsigned long coun= t) return count; } =20 -long vwrite(char *buf, char *addr, unsigned long count) -{ - /* Don't allow overflow */ - if ((unsigned long) addr + count < count) - count =3D -(unsigned long) addr; - - memcpy(addr, buf, count); - return count; -} - /* * vmalloc - allocate virtually contiguous memory * diff --git a/mm/vmalloc.c b/mm/vmalloc.c index ccb405b82581..434f61c9c466 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2802,10 +2802,7 @@ static int aligned_vread(char *buf, char *addr, un= signed long count) * kmap() and get small overhead in this access function. */ if (p) { - /* - * we can expect USER0 is not used (see vread/vwrite's - * function description) - */ + /* We can expect USER0 is not used -- see vread() */ void *map =3D kmap_atomic(p); memcpy(buf, map + offset, length); kunmap_atomic(map); @@ -2820,43 +2817,6 @@ static int aligned_vread(char *buf, char *addr, un= signed long count) return copied; } =20 -static int aligned_vwrite(char *buf, char *addr, unsigned long count) -{ - struct page *p; - int copied =3D 0; - - while (count) { - unsigned long offset, length; - - offset =3D offset_in_page(addr); - length =3D PAGE_SIZE - offset; - if (length > count) - length =3D count; - p =3D vmalloc_to_page(addr); - /* - * To do safe access to this _mapped_ area, we need - * lock. But adding lock here means that we need to add - * overhead of vmalloc()/vfree() calles for this _debug_ - * interface, rarely used. Instead of that, we'll use - * kmap() and get small overhead in this access function. - */ - if (p) { - /* - * we can expect USER0 is not used (see vread/vwrite's - * function description) - */ - void *map =3D kmap_atomic(p); - memcpy(map + offset, buf, length); - kunmap_atomic(map); - } - addr +=3D length; - buf +=3D length; - copied +=3D length; - count -=3D length; - } - return copied; -} - /** * vread() - read vmalloc area in a safe way. * @buf: buffer for reading data @@ -2936,80 +2896,6 @@ long vread(char *buf, char *addr, unsigned long co= unt) return buflen; } =20 -/** - * vwrite() - write vmalloc area in a safe way. - * @buf: buffer for source data - * @addr: vm address. - * @count: number of bytes to be read. - * - * This function checks that addr is a valid vmalloc'ed area, and - * copy data from a buffer to the given addr. If specified range of - * [addr...addr+count) includes some valid address, data is copied from - * proper area of @buf. If there are memory holes, no copy to hole. - * IOREMAP area is treated as memory hole and no copy is done. - * - * If [addr...addr+count) doesn't includes any intersects with alive - * vm_struct area, returns 0. @buf should be kernel's buffer. - * - * Note: In usual ops, vwrite() is never necessary because the caller - * should know vmalloc() area is valid and can use memcpy(). - * This is for routines which have to access vmalloc area without - * any information, as /dev/kmem. - * - * Return: number of bytes for which addr and buf should be - * increased (same number as @count) or %0 if [addr...addr+count) - * doesn't include any intersection with valid vmalloc area - */ -long vwrite(char *buf, char *addr, unsigned long count) -{ - struct vmap_area *va; - struct vm_struct *vm; - char *vaddr; - unsigned long n, buflen; - int copied =3D 0; - - /* Don't allow overflow */ - if ((unsigned long) addr + count < count) - count =3D -(unsigned long) addr; - buflen =3D count; - - spin_lock(&vmap_area_lock); - list_for_each_entry(va, &vmap_area_list, list) { - if (!count) - break; - - if (!va->vm) - continue; - - vm =3D va->vm; - vaddr =3D (char *) vm->addr; - if (addr >=3D vaddr + get_vm_area_size(vm)) - continue; - while (addr < vaddr) { - if (count =3D=3D 0) - goto finished; - buf++; - addr++; - count--; - } - n =3D vaddr + get_vm_area_size(vm) - addr; - if (n > count) - n =3D count; - if (!(vm->flags & VM_IOREMAP)) { - aligned_vwrite(buf, addr, n); - copied++; - } - buf +=3D n; - addr +=3D n; - count -=3D n; - } -finished: - spin_unlock(&vmap_area_lock); - if (!copied) - return 0; - return buflen; -} - /** * remap_vmalloc_range_partial - map vmalloc pages to userspace * @vma: vma to cover --=20 2.29.2