From owner-svn-src-all@freebsd.org Mon Jul 25 21:19:55 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D0B4BA47B6 for ; Mon, 25 Jul 2016 21:19:55 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 22FA61445 for ; Mon, 25 Jul 2016 21:19:55 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wm0-x22a.google.com with SMTP id f65so150533332wmi.0 for ; Mon, 25 Jul 2016 14:19:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=/iyFrrgRtn3DZd4k39rmr+AhEHaazQ3i6f0lv9KKZkI=; b=SYnzf8zUYOf/SSS8dWTWTRe3ynsegsIy4JV0F3vNY+Yp10SluWYNQ+oJ765e+r9nI9 HdSI9eiKq5cYU7nhkbbLvkRtW3QehF01/splg1jel/5O/Z73eCk5NxrZCUAIq/euKklC +D07p2280Zz0z/BCvE4TFUIJWgJ2JhyaDibM4+pcR3nHWTCcXCf0j18zDK4NvUD9GDgx EJ7Za6+cAz6bj/SgudTDlzzMDjyN8QriMg9God8TNpyKfI6wkQtc/G7US8YUfauiekOJ pYzoy+VtnFaXw1y34Xl26M9PWQxpLtz8Hy5FX4yHq0IVrLkTQQ9DCf/pgwNFAc6KKdRO kuKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=/iyFrrgRtn3DZd4k39rmr+AhEHaazQ3i6f0lv9KKZkI=; b=Ge/LQ+8Gnmz3eYOD0whK49vkb2MvAcb/PESNskEMbd70zspwiYV99rVSsCAaFhPPjF wd8r5k5OZOTBs2XYdXQvBDpons2R+QN1pTFB4O1o1DrjrhisPV6KZWrMM14sXfwbWxn5 oH1/wDRFqiVsX3FAXyE0xqqqhC3+IeHQHkH0bJomviMfJYJ/1yuhGAnizno3hmxi636y VjoIHQWjIFNyJNa3KWZAiMZQhkHSVWQi81r1qyD1c7Rj2ntch7kjrwljX32A1+7kANBd sYLOX1GXxC6p/3ctQYuPFULU4T1StAl5Id20FpIRrGCVYXaBu3uq+ZQIaOiaAzmTkUBr /apw== X-Gm-Message-State: AEkoouvn9q6QKxNZKf/EXVU2qmCWfkS0Q+fOp5Eh09n2kMKu+QGtnDx2+jexyjUwcWDaaRjvFnp61H6x5ySLQAoJ X-Received: by 10.28.182.84 with SMTP id g81mr3800063wmf.20.1469481593656; Mon, 25 Jul 2016 14:19:53 -0700 (PDT) MIME-Version: 1.0 Received: by 10.194.73.99 with HTTP; Mon, 25 Jul 2016 14:19:53 -0700 (PDT) In-Reply-To: <201510291907.t9TJ70UN004616@repo.freebsd.org> References: <201510291907.t9TJ70UN004616@repo.freebsd.org> From: Oliver Pinter Date: Mon, 25 Jul 2016 23:19:53 +0200 Message-ID: Subject: Re: svn commit: r290156 - head/sys/amd64/amd64 To: Konstantin Belousov Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" , "Conrad E. Meyer" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jul 2016 21:19:55 -0000 On Thu, Oct 29, 2015 at 8:07 PM, Conrad E. Meyer wrote: > Author: cem > Date: Thu Oct 29 19:07:00 2015 > New Revision: 290156 > URL: https://svnweb.freebsd.org/changeset/base/290156 > > Log: > pmap_change_attr: Only fixup DMAP for DMAPed ranges > > pmap_change_attr must change the memory type of both the requested KVA > and the corresponding DMAP mappings (if such mappings exist), to satisfy > an Intel requirement that two or more mappings to the same physical > pages must have the same memory type. > > However, not all kernel mapped pages have corresponding DMAP mappings -- > for example, 64-bit BARs. Skip fixing up the DMAP for out-of-bounds > addresses. > > Submitted by: Steve Wahl > Reviewed by: alc, jhb > Sponsored by: Dell Compellent > Differential Revision: https://reviews.freebsd.org/D4030 > > Modified: > head/sys/amd64/amd64/pmap.c Hi Konstantin! MFC back this to 10-STABLE? Sure, it was never marked as MFC, but cem@ never mark them. Thanks, Oliver > > Modified: head/sys/amd64/amd64/pmap.c > ============================================================================== > --- head/sys/amd64/amd64/pmap.c Thu Oct 29 19:02:24 2015 (r290155) > +++ head/sys/amd64/amd64/pmap.c Thu Oct 29 19:07:00 2015 (r290156) > @@ -6411,7 +6411,7 @@ pmap_change_attr_locked(vm_offset_t va, > */ > for (tmpva = base; tmpva < base + size; ) { > pdpe = pmap_pdpe(kernel_pmap, tmpva); > - if (*pdpe == 0) > + if (pdpe == NULL || *pdpe == 0) > return (EINVAL); > if (*pdpe & PG_PS) { > /* > @@ -6484,7 +6484,8 @@ pmap_change_attr_locked(vm_offset_t va, > X86_PG_PDE_CACHE); > changed = TRUE; > } > - if (tmpva >= VM_MIN_KERNEL_ADDRESS) { > + if (tmpva >= VM_MIN_KERNEL_ADDRESS && > + (*pdpe & PG_PS_FRAME) < dmaplimit) { > if (pa_start == pa_end) { > /* Start physical address run. */ > pa_start = *pdpe & PG_PS_FRAME; > @@ -6513,7 +6514,8 @@ pmap_change_attr_locked(vm_offset_t va, > X86_PG_PDE_CACHE); > changed = TRUE; > } > - if (tmpva >= VM_MIN_KERNEL_ADDRESS) { > + if (tmpva >= VM_MIN_KERNEL_ADDRESS && > + (*pde & PG_PS_FRAME) < dmaplimit) { > if (pa_start == pa_end) { > /* Start physical address run. */ > pa_start = *pde & PG_PS_FRAME; > @@ -6540,7 +6542,8 @@ pmap_change_attr_locked(vm_offset_t va, > X86_PG_PTE_CACHE); > changed = TRUE; > } > - if (tmpva >= VM_MIN_KERNEL_ADDRESS) { > + if (tmpva >= VM_MIN_KERNEL_ADDRESS && > + (*pte & PG_PS_FRAME) < dmaplimit) { > if (pa_start == pa_end) { > /* Start physical address run. */ > pa_start = *pte & PG_FRAME; > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"