Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1141087pxx; Fri, 30 Oct 2020 03:11:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLtTFxUFebdbMB6Az9O/rvnholrl3LBid8Kp0AEFbDmdW8QqgbaVAoX9xzuaC2mVNH1cBZ X-Received: by 2002:a17:907:417d:: with SMTP id oe21mr1590382ejb.233.1604052691094; Fri, 30 Oct 2020 03:11:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604052691; cv=none; d=google.com; s=arc-20160816; b=GzJC99NfEiknMZj8RCTLzBvFfbXevLpKzqD5XlObYFc8yzfMxIGgEJX8U/ShYK0qJ5 6GVhZyzXnVGQ3m7VESD8OZfAjPRULrYZmmeuG8hFWL2lOt8WV7sTQqdWmYm0lgAL8Xyl Lbsru8/P9SNkiqvN+ZiF7Ua4D2JX2uDbhdcl4TNHMzAFQHhl9gbnZ74yHtgcSg8Dc6T+ V+6m57sc1VYpZbTyGWlVBH6NWUW+IZsTt7UtikVkT2NsPeCqNOWWy9ChABos1DqIr3FJ 8IbygPkNu8Pg8mVQoDHigyZUIS9RJ5YatvzNRIzEXOvIMpIsP3sQK0pTMNpo/4UoNYWP xzGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=x64Pdy8p+ZGL0slSw+rtx7HFhuDJqqnGsdIVDlQDjdQ=; b=ZBQJNfxQ3nV7INgCynJ7bnJaMEiid4l2QIjtavnawdhFuNHaeThgCmi8q3cqddqzAa zAyVMxCjdZDIFLKweZuJxzc8d8ZDD0Bi0CeK4vvj0Yi4GKbEAeEyH+jazNb3UYS9Yba3 CRFwb1okiPip4e1NSgIP93V4+LCi1PWneD44npECYngiX6igO79oF1PrucxXAxPTCq1l jq7RsrkMc/S90D0GYoT8JG7UU79dTP6BBohLP2+/DirLe4eO7pAL1I69vZHZcArA1xaZ q64W4tx99IE2Bk9pCkESszufbnTLIguNbJQjee/mpy//gJtpCmZlQLIvmDNyMg9AU28t YR2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=dMXZgQQ4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g1si5133110edn.177.2020.10.30.03.11.08; Fri, 30 Oct 2020 03:11:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=dMXZgQQ4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726556AbgJ3KJU (ORCPT + 99 others); Fri, 30 Oct 2020 06:09:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726492AbgJ3KJA (ORCPT ); Fri, 30 Oct 2020 06:09:00 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BA5CC0613D2 for ; Fri, 30 Oct 2020 03:08:59 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id b8so5837717wrn.0 for ; Fri, 30 Oct 2020 03:08:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x64Pdy8p+ZGL0slSw+rtx7HFhuDJqqnGsdIVDlQDjdQ=; b=dMXZgQQ4GInuf9jrQbek8Tp4TJwmqWcWzEoGzN+XnEIIgNSKSXrrzWsVgCIz1j4mbw c+B42LT5fsWsIB7y68aybpNVUX+JyN3Td0Ws9EA48SWBfWCaf3zgE6G6thggoKs//hX0 Upru27GCrw83TFd3ijeyNjhXKU4N04Gf2K5U4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x64Pdy8p+ZGL0slSw+rtx7HFhuDJqqnGsdIVDlQDjdQ=; b=HNBULmHfOwPGRlSxoeqLiGcLrG0Kx65JbMwsBMJSijMYtILvZ3kOBR7i79qJjM4TDC csFWDWu1dL0IMs10B7niLN7Q+3RN+1DsvVAr7StyGOtb3YjP07Kcmh4Ud0YZ6SJdCcRE R05k1NP+UqIDjzATBMmTIJRSclrK7oQq5quS//hgzsQok2RCxoV/H07YxWxkWt+j62GM FUCCnAtsnVUDBSBeeswumX84oBSsWtr3MvKayD7K1q/XeL7WPjjBdFebGqc0Q1Auvytv FzR+b4KYcltKPyKqhA5rTNJL6dYO2ytIrmI0kijogkoMw5xmGojNxDMlUDLYrzE9EQ0T aCdA== X-Gm-Message-State: AOAM532DBSxH+cf80FSufm+90rr7eeunRWnIHtauBPE9xJ+Ik6S1I37J dIoeSL7Pb7Rz4Has2Ot3iyp6bQ== X-Received: by 2002:a5d:4b12:: with SMTP id v18mr2021446wrq.259.1604052538157; Fri, 30 Oct 2020 03:08:58 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id v189sm4430947wmg.14.2020.10.30.03.08.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 03:08:57 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Cc: kvm@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-media@vger.kernel.org, Daniel Vetter , Greg Kroah-Hartman , Daniel Vetter , Jason Gunthorpe , Kees Cook , Dan Williams , Andrew Morton , John Hubbard , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jan Kara , Bjorn Helgaas , linux-pci@vger.kernel.org, "Rafael J. Wysocki" , Christian Brauner , "David S. Miller" , Michael Ellerman , Sourabh Jain , Mauro Carvalho Chehab , Nayna Jain Subject: [PATCH v5 14/15] sysfs: Support zapping of binary attr mmaps Date: Fri, 30 Oct 2020 11:08:14 +0100 Message-Id: <20201030100815.2269-15-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030100815.2269-1-daniel.vetter@ffwll.ch> References: <20201030100815.2269-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We want to be able to revoke pci mmaps so that the same access rules applies as for /dev/kmem. Revoke support for devmem was added in 3234ac664a87 ("/dev/mem: Revoke mappings when a driver claims the region"). The simplest way to achieve this is by having the same filp->f_mapping for all mappings, so that unmap_mapping_range can find them all, no matter through which file they've been created. Since this must be set at open time we need sysfs support for this. Add an optional mapping parameter bin_attr, which is only consulted when there's also an mmap callback, since without mmap support allowing to adjust the ->f_mapping makes no sense. Reviewed-by: Greg Kroah-Hartman Signed-off-by: Daniel Vetter Cc: Jason Gunthorpe Cc: Kees Cook Cc: Dan Williams Cc: Andrew Morton Cc: John Hubbard Cc: Jérôme Glisse Cc: Jan Kara Cc: Dan Williams Cc: linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Christian Brauner Cc: "David S. Miller" Cc: Michael Ellerman Cc: Sourabh Jain Cc: Daniel Vetter Cc: Mauro Carvalho Chehab Cc: Nayna Jain Signed-off-by: Daniel Vetter --- fs/sysfs/file.c | 11 +++++++++++ include/linux/sysfs.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 96d0da65e088..9aefa7779b29 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -170,6 +170,16 @@ static int sysfs_kf_bin_mmap(struct kernfs_open_file *of, return battr->mmap(of->file, kobj, battr, vma); } +static int sysfs_kf_bin_open(struct kernfs_open_file *of) +{ + struct bin_attribute *battr = of->kn->priv; + + if (battr->mapping) + of->file->f_mapping = battr->mapping; + + return 0; +} + void sysfs_notify(struct kobject *kobj, const char *dir, const char *attr) { struct kernfs_node *kn = kobj->sd, *tmp; @@ -241,6 +251,7 @@ static const struct kernfs_ops sysfs_bin_kfops_mmap = { .read = sysfs_kf_bin_read, .write = sysfs_kf_bin_write, .mmap = sysfs_kf_bin_mmap, + .open = sysfs_kf_bin_open, }; int sysfs_add_file_mode_ns(struct kernfs_node *parent, diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 2caa34c1ca1a..d76a1ddf83a3 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -164,11 +164,13 @@ __ATTRIBUTE_GROUPS(_name) struct file; struct vm_area_struct; +struct address_space; struct bin_attribute { struct attribute attr; size_t size; void *private; + struct address_space *mapping; ssize_t (*read)(struct file *, struct kobject *, struct bin_attribute *, char *, loff_t, size_t); ssize_t (*write)(struct file *, struct kobject *, struct bin_attribute *, -- 2.28.0