From patchwork Wed Nov 6 12:35:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13864786 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 4BC98D44D54 for ; Wed, 6 Nov 2024 12:38:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A65FC6B00A1; Wed, 6 Nov 2024 07:38:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C5E36B00A3; Wed, 6 Nov 2024 07:38:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 84B876B00B3; Wed, 6 Nov 2024 07:38:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 636D06B00A1 for ; Wed, 6 Nov 2024 07:38:34 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 23B6EC01C7 for ; Wed, 6 Nov 2024 12:38:34 +0000 (UTC) X-FDA: 82755622026.03.3B328A8 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf30.hostedemail.com (Postfix) with ESMTP id B01D180020 for ; Wed, 6 Nov 2024 12:37:27 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cLDtLdU3; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730896628; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=aZQE6Gk2pDLRsrGirLF3LOxjqtk3JDWUrBtiyK47AD0=; b=iCeKKX82glFEeZE6Z/5WlVu0vXmk3fm798a98VM0g3kqQKl49k+TAJi2Xn0F+PaMWDmZ+T Gze02trSgHCJvKNs80nADa81cwDlSb8+I/POUxs+aEPsBEr88sZliVFzbxmK2DrUjiPATF qB0usqEQUJ/h+/zA741+AYORWcgyZVI= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cLDtLdU3; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730896628; a=rsa-sha256; cv=none; b=xsvibjVSGpUBDrcO6NiK9hocURcEOwT1hwf9iJItkb/NAjdA3rMfotKa+t2ML2tiVQ9H7F zQFo7XFDNgJ9KxRd30jO7CyAhWd0LL9KXd7ZnSSjOsAw195zWoB6swOSmoFqMNMy334BOB SGyVFOTN+G9zQ6h40prLi/bv3STQmx4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730896711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aZQE6Gk2pDLRsrGirLF3LOxjqtk3JDWUrBtiyK47AD0=; b=cLDtLdU3c3luD/IP4cU5tvpJamVD/o57cyaxBa9sR3MyElBtJ1TqlIeyJzrzWOUquM5yk9 l1jc3RKqCrNwyA497vTcgdgwDe7lmI8/4ULXMGRLPml+VKHm+BfRvE2WhfbqXuitC0CrNc MwI8AVI6/vm2gnh9NFzFWo1xOBNq6hs= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-459-g9gAON9hOxG1xk5qcIWRxg-1; Wed, 06 Nov 2024 07:38:28 -0500 X-MC-Unique: g9gAON9hOxG1xk5qcIWRxg-1 X-Mimecast-MFC-AGG-ID: g9gAON9hOxG1xk5qcIWRxg Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0D03519560B5; Wed, 6 Nov 2024 12:38:26 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 87C2C19560AA; Wed, 6 Nov 2024 12:38:20 +0000 (UTC) From: David Howells To: Christian Brauner , Steve French , Matthew Wilcox Cc: David Howells , Jeff Layton , Gao Xiang , Dominique Martinet , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 18/33] cachefiles: Add auxiliary data trace Date: Wed, 6 Nov 2024 12:35:42 +0000 Message-ID: <20241106123559.724888-19-dhowells@redhat.com> In-Reply-To: <20241106123559.724888-1-dhowells@redhat.com> References: <20241106123559.724888-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: B01D180020 X-Stat-Signature: hkm7qc4xf6kxr5nh474w6f387eu9zt57 X-HE-Tag: 1730896647-762743 X-HE-Meta: U2FsdGVkX19sxvp4p7kAVR7KhfNCGHaPQtx+tEqdvebb6GK/i2Y5OfMFuRKy7zVgf2pgtXy+6aUPr1Km3AmawiabYU1jnPPqePP4tHNBqbVtAc0ZLcw/FdCD3qFfibBO9rWutKqkyAaDnAiDOy0tpzK75pD7XOb/eoPr5HIfsymsyltT0wvchNo/I9Z3QXH217/8ZgvTtsD4hLSjVjYho7Hk1+g4LWKMRrkzvuVQiXzRFpapbKImOE4vZQCwNRQZj48yRUBslE+RJbWdYnwGhZRUCtR3qP6S1KeylX8TNJuWQsRjETs0X4E0MuB9LMW4nXW7lhYOtCRbzHfz+a4FiejO1WLHWCoWgTBGYJZXe6/EqcR03U+UgJuuy2KM3VhdIvdfdgCT5l8mRnnhgSatUzVmAaMsaG8PZlavDbAqTjaQk3GFXJQoVNwrPkashmqKBDg24hACWK+6aGfmp2ZcCju1q2kDS7m5G3zm9ZBB2zR29/f1Xi8rFEbITTw76Zwz8FHVhSx6aHQ00d0zH67q0kjuV/MFQsVrtOfhkFMTW1Z+syiJm0TTri20MJ6d0V5N6Vk2V2bPHDHK1sHFnHHkoZndOYfiZdn/cKUyvS1OuXU8yY5bJ2FsqvRaOgfh7ahndDZE2zG6GOsbLy6296nFuMvDuWks4huOtIijiePokx/sXeoXeDnMHbcU7Zs1ypDXBh9PqEXpjuTbo3OwOY1UkaVDCgjs0A9a7pdIn6Gz5ZYB7XZXIdxFAq5fWk4Mocms9ytBTTcj4uHeki6D1U6pGLvE2Xir/QZ90O7y+AnlL9UcE8qzZMv373SxD143BlPDCJF6EPwmBVUWJBCJc5o+TZjOwQOT58e6tFXuvnz32GS2kTLaaRUG7oS5yiA77jgL322iM7BeGKy9fk1OBrUy7cOreeUwF3DLSkxV+SmgUuIOjoimnTPHSRWhftDkEos49AyGFX64XlWgccr6x2i aJE+D8Da 9xb+jA5diXYK05If9Rz21TgH5bVg44us77IzoqGlXdtYPWUxc3twc0yy/HWNAUtHj/Qtal/HkQK4qAMuIbVbjBr8s9gumI+q+QFvtV5yRmcGL3Et7MYSVTTIQ0uqgsDBAVnR/mxqGSKHXJvZ2kdFzmkEiwTdrOWoeKsbrK9oLRYZip4P57Z3z/Fkd6CCsyPg90cCQZHJ76V9AyyDcLyG5snD2chElR4C9sTrDnDt2EginwB8NFFbTkrrnYIqB2WGY6GrsNTkvXYsVOW4gYo5EHFLDWzbr4/enf0o+IBahFxc9j9Ovm5weAEIYHcihMlZVs3OznubXFalBRgS7uvl3IuoTH0zO1otnL9Z7aPGj/DdisPYpIGF5dvyN4uXymSDvjCgIFWtFTThu3Ark6X14WMDJAB60qpcWKF6Lw4YeIbpBA4s= 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: Add a display of the first 8 bytes of the downloaded auxiliary data and of the on-disk stored auxiliary data as these are used in coherency management. In the case of afs, this holds the data version number. Signed-off-by: David Howells cc: Jeff Layton cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/cachefiles/xattr.c | 9 ++++++++- include/trace/events/cachefiles.h | 13 ++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/fs/cachefiles/xattr.c b/fs/cachefiles/xattr.c index 7c6f260a3be5..52383b1d0ba6 100644 --- a/fs/cachefiles/xattr.c +++ b/fs/cachefiles/xattr.c @@ -77,6 +77,7 @@ int cachefiles_set_object_xattr(struct cachefiles_object *object) trace_cachefiles_vfs_error(object, file_inode(file), ret, cachefiles_trace_setxattr_error); trace_cachefiles_coherency(object, file_inode(file)->i_ino, + be64_to_cpup((__be64 *)buf->data), buf->content, cachefiles_coherency_set_fail); if (ret != -ENOMEM) @@ -85,6 +86,7 @@ int cachefiles_set_object_xattr(struct cachefiles_object *object) "Failed to set xattr with error %d", ret); } else { trace_cachefiles_coherency(object, file_inode(file)->i_ino, + be64_to_cpup((__be64 *)buf->data), buf->content, cachefiles_coherency_set_ok); } @@ -126,7 +128,10 @@ int cachefiles_check_auxdata(struct cachefiles_object *object, struct file *file object, "Failed to read aux with error %zd", xlen); why = cachefiles_coherency_check_xattr; - } else if (buf->type != CACHEFILES_COOKIE_TYPE_DATA) { + goto out; + } + + if (buf->type != CACHEFILES_COOKIE_TYPE_DATA) { why = cachefiles_coherency_check_type; } else if (memcmp(buf->data, p, len) != 0) { why = cachefiles_coherency_check_aux; @@ -141,7 +146,9 @@ int cachefiles_check_auxdata(struct cachefiles_object *object, struct file *file ret = 0; } +out: trace_cachefiles_coherency(object, file_inode(file)->i_ino, + be64_to_cpup((__be64 *)buf->data), buf->content, why); kfree(buf); return ret; diff --git a/include/trace/events/cachefiles.h b/include/trace/events/cachefiles.h index 7d931db02b93..775a72e6adc6 100644 --- a/include/trace/events/cachefiles.h +++ b/include/trace/events/cachefiles.h @@ -380,10 +380,11 @@ TRACE_EVENT(cachefiles_rename, TRACE_EVENT(cachefiles_coherency, TP_PROTO(struct cachefiles_object *obj, ino_t ino, + u64 disk_aux, enum cachefiles_content content, enum cachefiles_coherency_trace why), - TP_ARGS(obj, ino, content, why), + TP_ARGS(obj, ino, disk_aux, content, why), /* Note that obj may be NULL */ TP_STRUCT__entry( @@ -391,6 +392,8 @@ TRACE_EVENT(cachefiles_coherency, __field(enum cachefiles_coherency_trace, why ) __field(enum cachefiles_content, content ) __field(u64, ino ) + __field(u64, aux ) + __field(u64, disk_aux) ), TP_fast_assign( @@ -398,13 +401,17 @@ TRACE_EVENT(cachefiles_coherency, __entry->why = why; __entry->content = content; __entry->ino = ino; + __entry->aux = be64_to_cpup((__be64 *)obj->cookie->inline_aux); + __entry->disk_aux = disk_aux; ), - TP_printk("o=%08x %s B=%llx c=%u", + TP_printk("o=%08x %s B=%llx c=%u aux=%llx dsk=%llx", __entry->obj, __print_symbolic(__entry->why, cachefiles_coherency_traces), __entry->ino, - __entry->content) + __entry->content, + __entry->aux, + __entry->disk_aux) ); TRACE_EVENT(cachefiles_vol_coherency,