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=-12.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,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 0E31CC43219 for ; Tue, 30 Apr 2019 11:28:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7BEE21707 for ; Tue, 30 Apr 2019 11:28:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b="sIwB0ZO/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727950AbfD3L23 (ORCPT ); Tue, 30 Apr 2019 07:28:29 -0400 Received: from terminus.zytor.com ([198.137.202.136]:59417 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726202AbfD3L22 (ORCPT ); Tue, 30 Apr 2019 07:28:28 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x3UBRYXb1350369 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 30 Apr 2019 04:27:34 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 terminus.zytor.com x3UBRYXb1350369 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2019041745; t=1556623655; bh=3J+6Z6Kv0wPU0KZGkXia8Ke4yBkQoijiEqp8tgUmH0M=; h=Date:From:Cc:Reply-To:In-Reply-To:References:To:Subject:From; b=sIwB0ZO/DpcNGCumGTBaXX/pYpm1GT0TwX/bZlZkV8H1TctbMr/RU3bKZ/hsSmdwM SnBRJ4/krcn8ajKvDdtUYO8faNXCNd8IoMfmwRs4sWUWKl/afaS2/teeIrVO89GneC shIPyyCJpoRrT4PVjnSyj+XtwQLcw16BLw6pIO93apHZMd0IYjzT2uA1Bbtq9EL4Zz n8wQBvyL/k86TGzCByZvRxYe0C6tk5JQPcBwQ5789ZfA8ymvE+3TGTShVd1wnZWrt2 zwPfPMNoZIh0i2Ycib4gi6Bc9OMEsPjoFY0IGULunBIAcEFZnj9QCBCluLTP589Txp 8s3CrwkdL7Psg== Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x3UBRXCR1350366; Tue, 30 Apr 2019 04:27:33 -0700 Date: Tue, 30 Apr 2019 04:27:33 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Rick Edgecombe Message-ID: Cc: peterz@infradead.org, daniel@iogearbox.net, will.deacon@arm.com, torvalds@linux-foundation.org, akpm@linux-foundation.org, dave.hansen@linux.intel.com, bp@alien8.de, deneen.t.dock@intel.com, rick.p.edgecombe@intel.com, tglx@linutronix.de, kernel-hardening@lists.openwall.com, linux_dti@icloud.com, ard.biesheuvel@linaro.org, luto@kernel.org, mingo@kernel.org, hpa@zytor.com, riel@surriel.com, nadav.amit@gmail.com, ast@kernel.org, kristen@linux.intel.com, linux-kernel@vger.kernel.org Reply-To: peterz@infradead.org, daniel@iogearbox.net, will.deacon@arm.com, torvalds@linux-foundation.org, bp@alien8.de, dave.hansen@linux.intel.com, deneen.t.dock@intel.com, akpm@linux-foundation.org, rick.p.edgecombe@intel.com, tglx@linutronix.de, kernel-hardening@lists.openwall.com, ard.biesheuvel@linaro.org, linux_dti@icloud.com, luto@kernel.org, hpa@zytor.com, mingo@kernel.org, riel@surriel.com, nadav.amit@gmail.com, ast@kernel.org, linux-kernel@vger.kernel.org, kristen@linux.intel.com In-Reply-To: <20190426001143.4983-19-namit@vmware.com> References: <20190426001143.4983-19-namit@vmware.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] bpf: Use vmalloc special flag Git-Commit-ID: d53d2f78ceadba081fc7785570798c3c8d50a718 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d53d2f78ceadba081fc7785570798c3c8d50a718 Gitweb: https://git.kernel.org/tip/d53d2f78ceadba081fc7785570798c3c8d50a718 Author: Rick Edgecombe AuthorDate: Thu, 25 Apr 2019 17:11:38 -0700 Committer: Ingo Molnar CommitDate: Tue, 30 Apr 2019 12:37:59 +0200 bpf: Use vmalloc special flag Use new flag VM_FLUSH_RESET_PERMS for handling freeing of special permissioned memory in vmalloc and remove places where memory was set RW before freeing which is no longer needed. Don't track if the memory is RO anymore because it is now tracked in vmalloc. Signed-off-by: Rick Edgecombe Signed-off-by: Peter Zijlstra (Intel) Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Daniel Borkmann Cc: Dave Hansen Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Nadav Amit Cc: Rik van Riel Cc: Thomas Gleixner Link: https://lkml.kernel.org/r/20190426001143.4983-19-namit@vmware.com Signed-off-by: Ingo Molnar --- include/linux/filter.h | 17 +++-------------- kernel/bpf/core.c | 1 - 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index 14ec3bdad9a9..7d3abde3f183 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -503,7 +504,6 @@ struct bpf_prog { u16 pages; /* Number of allocated pages */ u16 jited:1, /* Is our filter JIT'ed? */ jit_requested:1,/* archs need to JIT the prog */ - undo_set_mem:1, /* Passed set_memory_ro() checkpoint */ gpl_compatible:1, /* Is filter GPL compatible? */ cb_access:1, /* Is control block accessed? */ dst_needed:1, /* Do we need dst entry? */ @@ -733,27 +733,17 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default) static inline void bpf_prog_lock_ro(struct bpf_prog *fp) { - fp->undo_set_mem = 1; + set_vm_flush_reset_perms(fp); set_memory_ro((unsigned long)fp, fp->pages); } -static inline void bpf_prog_unlock_ro(struct bpf_prog *fp) -{ - if (fp->undo_set_mem) - set_memory_rw((unsigned long)fp, fp->pages); -} - static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr) { + set_vm_flush_reset_perms(hdr); set_memory_ro((unsigned long)hdr, hdr->pages); set_memory_x((unsigned long)hdr, hdr->pages); } -static inline void bpf_jit_binary_unlock_ro(struct bpf_binary_header *hdr) -{ - set_memory_rw((unsigned long)hdr, hdr->pages); -} - static inline struct bpf_binary_header * bpf_jit_binary_hdr(const struct bpf_prog *fp) { @@ -789,7 +779,6 @@ void __bpf_prog_free(struct bpf_prog *fp); static inline void bpf_prog_unlock_free(struct bpf_prog *fp) { - bpf_prog_unlock_ro(fp); __bpf_prog_free(fp); } diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index ff09d32a8a1b..c605397c79f0 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -848,7 +848,6 @@ void __weak bpf_jit_free(struct bpf_prog *fp) if (fp->jited) { struct bpf_binary_header *hdr = bpf_jit_binary_hdr(fp); - bpf_jit_binary_unlock_ro(hdr); bpf_jit_binary_free(hdr); WARN_ON_ONCE(!bpf_prog_kallsyms_verify_off(fp));