From patchwork Tue Nov 12 17:55:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13872735 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8508D42BBE for ; Tue, 12 Nov 2024 17:56:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2ED5E6B00A3; Tue, 12 Nov 2024 12:56:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 29F056B0103; Tue, 12 Nov 2024 12:56:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0CA686B0105; Tue, 12 Nov 2024 12:56:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CFAB06B00A3 for ; Tue, 12 Nov 2024 12:56:46 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8EA711C4F0C for ; Tue, 12 Nov 2024 17:56:46 +0000 (UTC) X-FDA: 82778196522.19.E3E7F27 Received: from mail-yb1-f179.google.com (mail-yb1-f179.google.com [209.85.219.179]) by imf22.hostedemail.com (Postfix) with ESMTP id 971A3C000E for ; Tue, 12 Nov 2024 17:55:52 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=toxicpanda-com.20230601.gappssmtp.com header.s=20230601 header.b=ZFS3Al5c; dmarc=none; spf=none (imf22.hostedemail.com: domain of josef@toxicpanda.com has no SPF policy when checking 209.85.219.179) smtp.mailfrom=josef@toxicpanda.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731434142; a=rsa-sha256; cv=none; b=upioBcFdlC5Ur8khQBn/TZsmR0IeQT1kBHGSfVCO606nLzw5Mt3xvI9A3B1ZOHAw99saZw S0BZdnm/yZsqiQrx2caJ2AP/fl0owTbHsX2JTkjquhh1Ue7kamume25IUrVBjA+1Cz40UU wewN64ckL6Mm3EZQNqht3HfCreoFCE0= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=toxicpanda-com.20230601.gappssmtp.com header.s=20230601 header.b=ZFS3Al5c; dmarc=none; spf=none (imf22.hostedemail.com: domain of josef@toxicpanda.com has no SPF policy when checking 209.85.219.179) smtp.mailfrom=josef@toxicpanda.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731434142; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zmpMu+cyUA93dTz87+bG4l2t/L8RTFnzlJy59zXnVRk=; b=Azr6BaPzJyjhblp4qKON0Zf+KdhjNzlneSKd6gPji0B/yURikvqk9opdxeG18SkoF7fIKn mLB3eTgW5FN/zuxE+Eoa6BOXqJRwk6ZWFNGC0mcbBNgdjYO84E+HqgwVN5dnj4niGVK78Z X10hSYjGg7x4IBTre2VuXmRdhzLIIdw= Received: by mail-yb1-f179.google.com with SMTP id 3f1490d57ef6-e30d0d84d23so5269949276.3 for ; Tue, 12 Nov 2024 09:56:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1731434204; x=1732039004; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zmpMu+cyUA93dTz87+bG4l2t/L8RTFnzlJy59zXnVRk=; b=ZFS3Al5cDUDA8TWoEZIScmrmqy07n+mEVX14SEdOnc28wB5zLisssjkl2sbpKmDlPU E+sYR9UdBUuGVxjhKsQZDXgUGct8YFTLloVjztTHi4Jmr2vpalTs9B4VEIcJRWtqH1l8 zt6vyFRNjD0vXE+UTEzh1H3BRQlZiIv0MCY9EUFPBhOvu8MnncnjIlTDsGz6krftdw1u PrL/C4qfCqtKyTT7zAL6LXxm6Vn2XIyamd7h/JKjw0LX2D/12obKCclt5u6ZyYwH6JXC zTDRQ3wO6hnCvabMOx+WzNQye72CuKPBDCgSvTnRZoad57d2meKq2CPEXY/IQr75JcYI ZiFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731434204; x=1732039004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zmpMu+cyUA93dTz87+bG4l2t/L8RTFnzlJy59zXnVRk=; b=RkPTepQDBI09Iq1UWys8IdYdwAvNBwB+Zc+dCOxW/0KSlGbT+tsrm1LpCJYCgzyDxg AD82uQXVKBTHRiXz7XRUENJ/w8b3DHtFjIkE8wGR7N2Kbg1nnHAhepjwcJ85/OKNYoR+ tMqWk2+ZH2a2cX0CDIzqUsGfNeE0ceiyugM7fFuIhDY62tFGwv0dP3eaDxYnnpJXyMK4 ULlLliin1kQufG/9JvGtUTg0Bs5w7zczM2fR3SW3xdhRArULfbnkKrWyQj+6enODhugF kPjja+qQytNpkZ3BkrIg+g13J3zV0atDwNp8RWhYcU+IRlqIE8XULjL7VIDB7hlFv1U2 IAAg== X-Forwarded-Encrypted: i=1; AJvYcCX3mEmZNd0VD1Nb/NYYnFhNrpOyK6Wwa9K2w8NjrLinA5TCmtKajUWX163YF+KpDwYOW48VU5DDCw==@kvack.org X-Gm-Message-State: AOJu0Yw4W0x1ch/BoqKzLiaKGJIcms3MPqdHwH7D0Md1V/93HU1875wP xhxa7KzBen6S7Wt5ZKJ8y95I2dw/vdYWe1VABWUaHFzfLPGTZVap8xXkkyYy5+U= X-Google-Smtp-Source: AGHT+IFoYbCAjCHUFKm3DZPieLWA6AhlwnAEoVWWiOeBhhtsUN5DL1tJA6JbxgolnU89lhaXg5Pm5g== X-Received: by 2002:a05:690c:6f8d:b0:6d3:f283:8550 with SMTP id 00721157ae682-6eaddf977a8mr188770267b3.28.1731434203995; Tue, 12 Nov 2024 09:56:43 -0800 (PST) Received: from localhost (syn-076-182-020-124.res.spectrum.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6eace8d5216sm26312647b3.26.2024.11.12.09.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 09:56:43 -0800 (PST) From: Josef Bacik To: kernel-team@fb.com, linux-fsdevel@vger.kernel.org, jack@suse.cz, amir73il@gmail.com, brauner@kernel.org, torvalds@linux-foundation.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-mm@kvack.org, linux-ext4@vger.kernel.org Subject: [PATCH v7 10/18] fanotify: report file range info with pre-content events Date: Tue, 12 Nov 2024 12:55:25 -0500 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 971A3C000E X-Rspamd-Server: rspam01 X-Stat-Signature: xcj6ank84icx6ye6snqhwqef7ng4zrzo X-HE-Tag: 1731434152-902760 X-HE-Meta: U2FsdGVkX18CkSfDtr1KD1klSjsAub336c1cEhNOn3TkWpmBDpj7dxil2lrnjIEK5raXDXzSR5KCYgspJxjCNoWwolOVNbs6Q0xfx0m01xZAqs/9e7lUxh7Uz/nTMPXJq/CZZU8iwVsFTCIo6DCpFCYF/anYLJ32DSn8qqYSm4W7gsESLmVHVe9CKZVzax4QH0CBuKwm3F2IfTmx18QRYTEzEuiVfA/G157nM6f+gX2F4nBOaXnNOX8W+a7hcZGmn4GcLw/2WzkprHg13prhg2XaFsPfKlPL6Wxz5A4KwtkSwzfgLJU62sIpBmN4qwShjHYoICuvuMoI8OBgL7Y7AOLZLkPXs07qhSUYnuQxMMuyy3f6m8BlepndDMg/WJl4WmYtdelE57NfwfeIyl8rJ+WF6hZ0bEocATA5E2c3vsDvHUpeIwYyyBpcdpBwxn1IM8iqgqolkxZJsdvgDVAr/eMJ4qYGi2YkDmELsxuVgQhG+5CnwMbTiXZzGJ9YQzLs99K59OjcM9YH18nuMBV+9Pq6zMXhQ+bVN77idDSHf0RvyhB3tKiCJPUNmsnUoRDjjvOPySrNUh/Q+hLRcJBrJkDBDOghSDIsIPbI7bTSWjUPsH3fpfPYqGKla1xFeVOa6UmwJCqZkkOWF0Fo/fvT0OpfocWnTFFUGnFEfd5L0BxpkkBaHo5+IlXvU1hXi70HxFp24WLYhTJ9lODZMWyJdkM0HqU2Npzr/Iq2vOL6uSCHkDkSiDXcYcD0nmJcnHsxJjRPuYhwnv3vVZ5pprttzi9vUyBiOlcZUJXOQz1qQ5ib31MAn9eawDE+QQfnivulerNshwNNrniQcBccCTl8bb87CWBrJygc0OpS8a6bGFtRIWf7aL3rYVHW0f5BCSpT2dWfzcn4ZS3yLBcOK5nzWJGxh5HPbum1fFTar1NADSjUd1gtR3Vk74TBBtWM4bz4j+YpHDuIiN2cXOpc7B+ QJYUg6HY hCsNBX+BjZsVLflJlDBwVOKnRYdWoBCiFgJ4sW4jGsHPOIitVsIO9ggNfbEceZ2n5gbAT10z3GS2dHalE2xDmYSft7quEAlFPZ2hSSwEHe1jhvIJIzQBPbnyIFA3MIltmp+NLoubHhdLOQHK43od0jd72ZMi/7H4MoauA7MEs51JaPMiyG+BKoefhlDLN/kb9m90MqFz+y6TlT8EEQVFeqA/2whPOrk14QBrDaFp6KFE3rGL9k1lLUuWI4mLhwViTAox5nTH2P3VXDnYGqCiaaKmwGU2qFkj8a0lGHTCCydbEo1vhkcP83rUmm9J4N8U5DqmHkVX5BVWTcOZ7MGnsh8ZgQzTbBkDOloA2TjgpxbuEBEDfAv+E+6vtQDVu3C2FMFwL8VzM+9sGMWMrbd+CntDRirMn1XA7a3BMP5HqVhB7/+UYs9rHXMUhrHP6oKCFlqGl4zWiWXxe300= 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: List-Subscribe: List-Unsubscribe: From: Amir Goldstein With group class FAN_CLASS_PRE_CONTENT, report offset and length info along with FAN_PRE_ACCESS pre-content events. This information is meant to be used by hierarchical storage managers that want to fill partial content of files on first access to range. Signed-off-by: Amir Goldstein --- fs/notify/fanotify/fanotify.h | 8 +++++++ fs/notify/fanotify/fanotify_user.c | 38 ++++++++++++++++++++++++++++++ include/uapi/linux/fanotify.h | 8 +++++++ 3 files changed, 54 insertions(+) diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h index 93598b7d5952..7f06355afa1f 100644 --- a/fs/notify/fanotify/fanotify.h +++ b/fs/notify/fanotify/fanotify.h @@ -448,6 +448,14 @@ static inline bool fanotify_is_perm_event(u32 mask) mask & FANOTIFY_PERM_EVENTS; } +static inline bool fanotify_event_has_access_range(struct fanotify_event *event) +{ + if (!(event->mask & FANOTIFY_PRE_CONTENT_EVENTS)) + return false; + + return FANOTIFY_PERM(event)->ppos; +} + static inline struct fanotify_event *FANOTIFY_E(struct fsnotify_event *fse) { return container_of(fse, struct fanotify_event, fse); diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 2ec0cc9c85cf..5ab9ad69915a 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -122,6 +122,8 @@ struct kmem_cache *fanotify_perm_event_cachep __ro_after_init; sizeof(struct fanotify_event_info_pidfd) #define FANOTIFY_ERROR_INFO_LEN \ (sizeof(struct fanotify_event_info_error)) +#define FANOTIFY_RANGE_INFO_LEN \ + (sizeof(struct fanotify_event_info_range)) static int fanotify_fid_info_len(int fh_len, int name_len) { @@ -181,6 +183,9 @@ static size_t fanotify_event_len(unsigned int info_mode, if (info_mode & FAN_REPORT_PIDFD) event_len += FANOTIFY_PIDFD_INFO_LEN; + if (fanotify_event_has_access_range(event)) + event_len += FANOTIFY_RANGE_INFO_LEN; + return event_len; } @@ -518,6 +523,30 @@ static int copy_pidfd_info_to_user(int pidfd, return info_len; } +static size_t copy_range_info_to_user(struct fanotify_event *event, + char __user *buf, int count) +{ + struct fanotify_perm_event *pevent = FANOTIFY_PERM(event); + struct fanotify_event_info_range info = { }; + size_t info_len = FANOTIFY_RANGE_INFO_LEN; + + if (WARN_ON_ONCE(info_len > count)) + return -EFAULT; + + if (WARN_ON_ONCE(!pevent->ppos)) + return -EINVAL; + + info.hdr.info_type = FAN_EVENT_INFO_TYPE_RANGE; + info.hdr.len = info_len; + info.offset = *(pevent->ppos); + info.count = pevent->count; + + if (copy_to_user(buf, &info, info_len)) + return -EFAULT; + + return info_len; +} + static int copy_info_records_to_user(struct fanotify_event *event, struct fanotify_info *info, unsigned int info_mode, int pidfd, @@ -639,6 +668,15 @@ static int copy_info_records_to_user(struct fanotify_event *event, total_bytes += ret; } + if (fanotify_event_has_access_range(event)) { + ret = copy_range_info_to_user(event, buf, count); + if (ret < 0) + return ret; + buf += ret; + count -= ret; + total_bytes += ret; + } + return total_bytes; } diff --git a/include/uapi/linux/fanotify.h b/include/uapi/linux/fanotify.h index 7596168c80eb..0636a9c85dd0 100644 --- a/include/uapi/linux/fanotify.h +++ b/include/uapi/linux/fanotify.h @@ -146,6 +146,7 @@ struct fanotify_event_metadata { #define FAN_EVENT_INFO_TYPE_DFID 3 #define FAN_EVENT_INFO_TYPE_PIDFD 4 #define FAN_EVENT_INFO_TYPE_ERROR 5 +#define FAN_EVENT_INFO_TYPE_RANGE 6 /* Special info types for FAN_RENAME */ #define FAN_EVENT_INFO_TYPE_OLD_DFID_NAME 10 @@ -192,6 +193,13 @@ struct fanotify_event_info_error { __u32 error_count; }; +struct fanotify_event_info_range { + struct fanotify_event_info_header hdr; + __u32 pad; + __u64 offset; + __u64 count; +}; + /* * User space may need to record additional information about its decision. * The extra information type records what kind of information is included.