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.5 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 31E28C433E0 for ; Fri, 5 Feb 2021 21:20:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CB3D564FB7 for ; Fri, 5 Feb 2021 21:20:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB3D564FB7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 470B36F4D6; Fri, 5 Feb 2021 21:20:37 +0000 (UTC) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 188F26F4D8 for ; Fri, 5 Feb 2021 21:20:36 +0000 (UTC) Received: by mail-pj1-x102a.google.com with SMTP id fa16so3893823pjb.1 for ; Fri, 05 Feb 2021 13:20:36 -0800 (PST) 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=ZYhyH/UoKAZ0pUR5GxFLgA12f7+59pz9aTtQWcg/Skw=; b=R02SrSjetAsxFVmsYiUkEaJlwQ55nZeZL2cuCV8kSBOiUaZp+orsa3k1DkBH8r1o+O K8nZlJWEmJYwLWIcMeuHoNjCU7WwUO05WaeDd2OSjhi3CUfrp7ekX8vcjLmxTBoLdCm/ F1sJLEErN2lZYfcW48Wiw43kdbDCng5x9MENg= 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=ZYhyH/UoKAZ0pUR5GxFLgA12f7+59pz9aTtQWcg/Skw=; b=VFQXmNuy8yiF4I6rhNc1q/E7qDMtClVu35pwoC/OCvnCGOGkwq80qg7gvRKWhji9cA 64iefab5N+xAdMjdCEbnL4PsNB91qwIGOUZdHbcGC4BBTNa+3stZSpYHCeVnksgnwiyo KgkGqWTv5nQWtcN03gt7O09emd+qdR8GEOnke0+N5aGBfrxUinWhxWhUSpKIp4fCC7ua DXZtRhFq29KweNBr/WhWHz46WBAaW8CVSt2dsIgOS8Vgk4Y9CZmWn8WGCAmaOT2cjyPd l7wmGoOxy+I9PUwa+BCkJGegULc/UrY9vlspfjeP0grKJ/nIeumszLTc5+gUjKurrfsB JRfA== X-Gm-Message-State: AOAM533OolXDIYc9GHIY9ILUlLUA22ArxNzK8Jt1VhGox0TZkX01zCXj K1Wjp7Z7uqBwH9zYhJp8CjkqvA== X-Google-Smtp-Source: ABdhPJwu85fzWnYg65UdufVcnja7D169FBdJJ4/E0S/U4P8nrMrT7ItVPkNRWfYlV2eGz5u6W5tkgA== X-Received: by 2002:a17:90b:11c9:: with SMTP id gv9mr5843284pjb.196.1612560035614; Fri, 05 Feb 2021 13:20:35 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id 12sm9167516pjm.28.2021.02.05.13.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 13:20:34 -0800 (PST) Date: Fri, 5 Feb 2021 13:20:33 -0800 From: Kees Cook To: Chris Wilson Message-ID: <202102051319.E5D8B4528D@keescook> References: <20210205163752.11932-1-chris@chris-wilson.co.uk> <20210205210610.29837-1-chris@chris-wilson.co.uk> <161255976138.12021.9385501710085642237@build.alporthouse.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <161255976138.12021.9385501710085642237@build.alporthouse.com> Subject: Re: [Intel-gfx] [PATCH v2] kernel: Expose SYS_kcmp by default X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Will Drewry , Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Andy Lutomirski , Andrew Morton , Lucas Stach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Feb 05, 2021 at 09:16:01PM +0000, Chris Wilson wrote: > The subject should of course be changed, as it is no longer being > enabled by default. "default n" is redundant. I thought Daniel said CONFIG_DRM needed to "select" it too, though? Otherwise, yeah, this looks good. Was the export due to the 0-day bot failure reports? -Kees > > Something like > > kcmp: Support selection of SYS_kcmp without CHECKPOINT_RESTORE > > Quoting Chris Wilson (2021-02-05 21:06:10) > > Userspace has discovered the functionality offered by SYS_kcmp and has > > started to depend upon it. In particular, Mesa uses SYS_kcmp for > > os_same_file_description() in order to identify when two fd (e.g. device > > or dmabuf) point to the same struct file. Since they depend on it for > > core functionality, lift SYS_kcmp out of the non-default > > CONFIG_CHECKPOINT_RESTORE into the selectable syscall category. > > > > Note that some distributions such as Ubuntu are already enabling > > CHECKPOINT_RESTORE in their configs and so, by extension, SYS_kcmp. > > > > References: https://gitlab.freedesktop.org/drm/intel/-/issues/3046 > > Signed-off-by: Chris Wilson > > Cc: Kees Cook > > Cc: Andy Lutomirski > > Cc: Will Drewry > > Cc: Andrew Morton > > Cc: Dave Airlie > > Cc: Daniel Vetter > > Cc: Lucas Stach > > Acked-by: Daniel Vetter # DRM depends on SYS_kcmp > > > > --- > > v2: > > - Default n. > > - Borrrow help message from man kcmp. > > - Export get_epoll_tfile_raw_ptr() for CONFIG_KCMP > > --- > > fs/eventpoll.c | 4 ++-- > > include/linux/eventpoll.h | 2 +- > > init/Kconfig | 12 ++++++++++++ > > kernel/Makefile | 2 +- > > tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +- > > 5 files changed, 17 insertions(+), 5 deletions(-) > > > > diff --git a/fs/eventpoll.c b/fs/eventpoll.c > > index a829af074eb5..3196474cbe24 100644 > > --- a/fs/eventpoll.c > > +++ b/fs/eventpoll.c > > @@ -979,7 +979,7 @@ static struct epitem *ep_find(struct eventpoll *ep, struct file *file, int fd) > > return epir; > > } > > > > -#ifdef CONFIG_CHECKPOINT_RESTORE > > +#ifdef CONFIG_KCMP > > static struct epitem *ep_find_tfd(struct eventpoll *ep, int tfd, unsigned long toff) > > { > > struct rb_node *rbp; > > @@ -1021,7 +1021,7 @@ struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, > > > > return file_raw; > > } > > -#endif /* CONFIG_CHECKPOINT_RESTORE */ > > +#endif /* CONFIG_KCMP */ > > > > /** > > * Adds a new entry to the tail of the list in a lockless way, i.e. > > diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h > > index 0350393465d4..593322c946e6 100644 > > --- a/include/linux/eventpoll.h > > +++ b/include/linux/eventpoll.h > > @@ -18,7 +18,7 @@ struct file; > > > > #ifdef CONFIG_EPOLL > > > > -#ifdef CONFIG_CHECKPOINT_RESTORE > > +#ifdef CONFIG_KCMP > > struct file *get_epoll_tfile_raw_ptr(struct file *file, int tfd, unsigned long toff); > > #endif > > > > diff --git a/init/Kconfig b/init/Kconfig > > index b77c60f8b963..1b75141bc18b 100644 > > --- a/init/Kconfig > > +++ b/init/Kconfig > > @@ -1194,6 +1194,7 @@ endif # NAMESPACES > > config CHECKPOINT_RESTORE > > bool "Checkpoint/restore support" > > select PROC_CHILDREN > > + select KCMP > > default n > > help > > Enables additional kernel features in a sake of checkpoint/restore. > > @@ -1737,6 +1738,17 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS > > config ARCH_HAS_MEMBARRIER_SYNC_CORE > > bool > > > > +config KCMP > > + bool "Enable kcmp() system call" if EXPERT > > + default n > > + help > > + Enable the kernel resource comparison system call. It provides > > + user-space with the ability to compare two processes to see if they > > + share a common resource, such as a file descriptor or even virtual > > + memory space. > > + > > + If unsure, say N. > > + > > config RSEQ > > bool "Enable rseq() system call" if EXPERT > > default y > > diff --git a/kernel/Makefile b/kernel/Makefile > > index aa7368c7eabf..320f1f3941b7 100644 > > --- a/kernel/Makefile > > +++ b/kernel/Makefile > > @@ -51,7 +51,7 @@ obj-y += livepatch/ > > obj-y += dma/ > > obj-y += entry/ > > > > -obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o > > +obj-$(CONFIG_KCMP) += kcmp.o > > obj-$(CONFIG_FREEZER) += freezer.o > > obj-$(CONFIG_PROFILING) += profile.o > > obj-$(CONFIG_STACKTRACE) += stacktrace.o > > diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c > > index 26c72f2b61b1..1b6c7d33c4ff 100644 > > --- a/tools/testing/selftests/seccomp/seccomp_bpf.c > > +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c > > @@ -315,7 +315,7 @@ TEST(kcmp) > > ret = __filecmp(getpid(), getpid(), 1, 1); > > EXPECT_EQ(ret, 0); > > if (ret != 0 && errno == ENOSYS) > > - SKIP(return, "Kernel does not support kcmp() (missing CONFIG_CHECKPOINT_RESTORE?)"); > > + SKIP(return, "Kernel does not support kcmp() (missing CONFIG_KCMP?)"); > > } > > > > TEST(mode_strict_support) > > -- > > 2.20.1 > > -- Kees Cook _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx