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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6FC6C433EF for ; Tue, 18 Jan 2022 18:15:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1828C6B0071; Tue, 18 Jan 2022 13:15:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 10C076B0073; Tue, 18 Jan 2022 13:15:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC6BC6B0074; Tue, 18 Jan 2022 13:15:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0057.hostedemail.com [216.40.44.57]) by kanga.kvack.org (Postfix) with ESMTP id D7ABB6B0071 for ; Tue, 18 Jan 2022 13:15:33 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 94E4E8249980 for ; Tue, 18 Jan 2022 18:15:33 +0000 (UTC) X-FDA: 79044210546.10.05D6B0E Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf23.hostedemail.com (Postfix) with ESMTP id EA9A6140002 for ; Tue, 18 Jan 2022 18:15:32 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E04F9212B8; Tue, 18 Jan 2022 18:15:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1642529730; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1ceYZmzAXYnHxSVUqh34MAPVnCq8FmQFJc0WiDhWpRc=; b=cQ7eWAx75L/YMSsO46wZHaf8GIhzeSQi2QFfciCkf+9GlmBIXCPvSJbBAHamKzETaKBV89 xN8VULsjuh/8bUgBtXnLziO8oImK0LEfez8+J6Q42kFi+4GlvTw+u6pd7UOeFJpiRJ3zJe 3xgBV+fSEW13mIAhBGv2H4Inhlb1b0s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1642529730; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1ceYZmzAXYnHxSVUqh34MAPVnCq8FmQFJc0WiDhWpRc=; b=5OH1NygMNTFTyuet+4ok0/7KndOPzudsgQaCizPBgStLRv76bwXN6DW3FiVqA8OVTQvJ5F J7pSB1pubN4qEwBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 91E6013AC9; Tue, 18 Jan 2022 18:15:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id DoHKIsID52G+OQAAMHmgww (envelope-from ); Tue, 18 Jan 2022 18:15:30 +0000 Message-ID: <412d2736-8a51-2360-431c-26978af1ecf7@suse.cz> Date: Tue, 18 Jan 2022 19:15:30 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH v4 35/66] optee: Remove vma linked list walk Content-Language: en-US To: Liam Howlett , "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Cc: Song Liu , Davidlohr Bueso , "Paul E . McKenney" , Matthew Wilcox , Laurent Dufour , David Rientjes , Axel Rasmussen , Suren Baghdasaryan , Rik van Riel , Peter Zijlstra , Michel Lespinasse , Jerome Glisse , Minchan Kim , Joel Fernandes , Rom Lemarchand References: <20211201142918.921493-1-Liam.Howlett@oracle.com> <20211201142918.921493-36-Liam.Howlett@oracle.com> From: Vlastimil Babka In-Reply-To: <20211201142918.921493-36-Liam.Howlett@oracle.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: EA9A6140002 X-Stat-Signature: pwi3uraguygcrs1zzjfkfdha7zoip8j4 Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=cQ7eWAx7; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=5OH1NygM; dmarc=none; spf=pass (imf23.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Rspamd-Server: rspam06 X-HE-Tag: 1642529732-618143 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: On 12/1/21 15:30, Liam Howlett wrote: > From: "Liam R. Howlett" > > Use the VMA iterator instead. Change the calling convention of > __check_mem_type() to pass in the mm instead of the first vma in the > range. > > Signed-off-by: Matthew Wilcox (Oracle) > Signed-off-by: Liam R. Howlett Acked-by: Vlastimil Babka > --- > drivers/tee/optee/call.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c > index b25cc1fac945..177575c445de 100644 > --- a/drivers/tee/optee/call.c > +++ b/drivers/tee/optee/call.c > @@ -342,15 +342,18 @@ static bool is_normal_memory(pgprot_t p) > #endif > } > > -static int __check_mem_type(struct vm_area_struct *vma, unsigned long end) > +static int __check_mem_type(struct mm_struct *mm, unsigned long start, > + unsigned long end) > { > - while (vma && is_normal_memory(vma->vm_page_prot)) { > - if (vma->vm_end >= end) > - return 0; > - vma = vma->vm_next; > + struct vm_area_struct *vma; > + VMA_ITERATOR(vmi, mm, start); > + > + for_each_vma_range(vmi, vma, end) { > + if (!is_normal_memory(vma->vm_page_prot)) > + return -EINVAL; > } > > - return -EINVAL; > + return 0; > } > > int optee_check_mem_type(unsigned long start, size_t num_pages) > @@ -366,8 +369,7 @@ int optee_check_mem_type(unsigned long start, size_t num_pages) > return 0; > > mmap_read_lock(mm); > - rc = __check_mem_type(find_vma(mm, start), > - start + num_pages * PAGE_SIZE); > + rc = __check_mem_type(mm, start, start + num_pages * PAGE_SIZE); > mmap_read_unlock(mm); > > return rc;