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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 E20B5C433ED for ; Wed, 14 Apr 2021 03:04:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8F155613BD for ; Wed, 14 Apr 2021 03:04:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F155613BD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 244846B0070; Tue, 13 Apr 2021 23:04:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F4856B007B; Tue, 13 Apr 2021 23:04:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 095D56B007D; Tue, 13 Apr 2021 23:04:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0231.hostedemail.com [216.40.44.231]) by kanga.kvack.org (Postfix) with ESMTP id E0FCD6B0070 for ; Tue, 13 Apr 2021 23:04:15 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 931E641E7E9F for ; Wed, 14 Apr 2021 03:04:15 +0000 (UTC) X-FDA: 78029478870.07.06D86C3 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf11.hostedemail.com (Postfix) with ESMTP id 41D392000255 for ; Wed, 14 Apr 2021 03:04:06 +0000 (UTC) Received: by mail-pj1-f51.google.com with SMTP id u14-20020a17090a1f0eb029014e38011b09so5226408pja.5 for ; Tue, 13 Apr 2021 20:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=YWlsnRSOQekuHI1nza1U/2ONG9pe3JCImgoC6OaquBA=; b=SXne9fh7omzAovHAQzanO8IhZ+//SWUNB4MkMEe45uUU0sYUSnLRltlNBuIBK9eJlf Lo9tasW+hDySRqLO+7tjixOAq7WnIPilXo10FJ+REohcVhguthzmHH5Vmw8qEU6RfDEr knc6b7AI/dgbzjUCvBUq8PM8SlyLWvzuvEKXQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=YWlsnRSOQekuHI1nza1U/2ONG9pe3JCImgoC6OaquBA=; b=FyxzhUtnaiWJe84tQJrGWiMEHx/lR5dCSKW63x4q2Bp3hu0JeMOYUAr1uHnoT80gL3 lGGJywZ1sDEuITojUPxwPBHr5XoLlAJZdzvJVXevWplkdunXroW4SW0S1SYZ6s0Ir8jy ISKHg3A43BItvnrt/bqkC4PZDswQwfoqM8cD8TZQA7aPbNP8i/bKV55XH7f4fgPdZFAg DfadbMcZ6q7fF8PxLYhkEkzU6O2a7GQiihF7/6iiP5I/PWz3V8NrOBHQ2+OFiAqwgMut dMwpv4IO9ac8uiC4XHvu+o6kTN9Td6MzV8jpxE2FVFglnyoSzqtAGUd52t/20w5zSQPb SFIQ== X-Gm-Message-State: AOAM533kNmd1BmHxBC6rginjrNY5AwIhnIPVkhFtp6HeqjTqLkxE0pn9 vJBk2DD6bfc3gk1JyFKAkXWmYA== X-Google-Smtp-Source: ABdhPJwsrb7nChofgZXy5qyqkooUJJDW3SUr838kF2MWEpNvljqx4WE8BGxk1sgcKKBpjL0Nznrz3Q== X-Received: by 2002:a17:90b:e0b:: with SMTP id ge11mr1038370pjb.127.1618369454295; Tue, 13 Apr 2021 20:04:14 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id d4sm3408238pjs.1.2021.04.13.20.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 20:04:13 -0700 (PDT) Date: Tue, 13 Apr 2021 20:04:12 -0700 From: Kees Cook To: Peter Zijlstra Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, boris.ostrovsky@oracle.com, jgross@suse.com, sstabellini@kernel.org, x86@kernel.org, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, chris@chris-wilson.co.uk, intel-gfx@lists.freedesktop.org, linux-mm@kvack.org, hch@lst.de Subject: Re: [PATCH 6/7] i915: Convert to verify_page_range() Message-ID: <202104132002.F03F8616DA@keescook> References: <20210412080012.357146277@infradead.org> <20210412080611.902470568@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210412080611.902470568@infradead.org> X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 41D392000255 X-Stat-Signature: tnifwoq9gnj9ietrirj4owfbgkt6pt1j Received-SPF: none (chromium.org>: No applicable sender policy available) receiver=imf11; identity=mailfrom; envelope-from=""; helo=mail-pj1-f51.google.com; client-ip=209.85.216.51 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618369446-20203 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 Mon, Apr 12, 2021 at 10:00:18AM +0200, Peter Zijlstra wrote: > check_{present,absent}() only need R/O access, use verify_page_range() > instead to remove modular use of apply_to_page_range(). > > Signed-off-by: Peter Zijlstra (Intel) > --- > drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > @@ -1225,9 +1225,9 @@ static int igt_mmap_gpu(void *arg) > return 0; > } > > -static int check_present_pte(pte_t *pte, unsigned long addr, void *data) > +static int check_present_pte(pte_t pte, unsigned long addr, void *data) > { > - if (!pte_present(*pte) || pte_none(*pte)) { > + if (!pte_present(pte) || pte_none(pte)) { > pr_err("missing PTE:%lx\n", > (addr - (unsigned long)data) >> PAGE_SHIFT); > return -EINVAL; > @@ -1236,9 +1236,9 @@ static int check_present_pte(pte_t *pte, > return 0; > } > > -static int check_absent_pte(pte_t *pte, unsigned long addr, void *data) > +static int check_absent_pte(pte_t pte, unsigned long addr, void *data) > { > - if (pte_present(*pte) && !pte_none(*pte)) { > + if (pte_present(pte) && !pte_none(pte)) { > pr_err("present PTE:%lx; expected to be revoked\n", > (addr - (unsigned long)data) >> PAGE_SHIFT); > return -EINVAL; > @@ -1249,14 +1249,14 @@ static int check_absent_pte(pte_t *pte, > > static int check_present(unsigned long addr, unsigned long len) > { > - return apply_to_page_range(current->mm, addr, len, > - check_present_pte, (void *)addr); > + return verify_page_range(current->mm, addr, len, > + check_present_pte, (void *)addr); > } And this would be: static int check_present(unsigned long addr, unsigned long len) unsigned long fail; fail = verify_page_range(current->mm, addr, len, check_present_pte); if (fail) { pr_err("missing PTE:%lx\n", addr); return -EINVAL; } } (Oh, and I think I messed up the page shifting macro name in the earlier one...) -- Kees Cook