From patchwork Tue Aug 27 18:02:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 13779986 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A7451D4172 for ; Tue, 27 Aug 2024 18:03:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724781812; cv=none; b=UeJ07/KuyNoP39VeyTJmkbEvIXNx5Tj1QW14DItC4DO7sNX+upoSofy1kAtCx/70fEfGOCNEOLIsyvIqwVx9Sddrc5ash5yXKy+QWmsKI6L2zZ5ItnYwr5DEJldhPTG6PS9qbP0MfHDEHUDvr8yf23jBsxaiui/ALdRNdWD9e80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724781812; c=relaxed/simple; bh=vRZxlA4NhcmLd0q6bUaelJnaLNQfejDBlwC1tsp+b8s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ATt1dhPqDIBCe5w/CULODFFYcgsr25MF/Caxihv8wY3zfYcISUv5Stv/c15VWAdPfdLfkE2EE24+lCQhXwuabvnRjQWCOPfyAJ8/qKpSDh3UimN++6YEcb+fmli2/34CEACDtHUP0rMUDqVVSF2oVMS4Hp9TpS49bHILZ5Nnzwg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Le3hIoW+; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Le3hIoW+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724781809; 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=LykJQUiuG045SO6zmRnu8bef9DxxtsLHq0x3Z+ewaXo=; b=Le3hIoW+1ltJpNta48qNcha7svzudb+pfePvGi3FIZj5QBxTzUmHQjWUhYXVUyO5jq8y1o ZITUB5jKxBMhNGt0vuXBGc31h24d6DOxiaq5K8VnXZdPe0LbgvXFfBONaf6Cv38bPkZfmM b8OdoFkDbcERCGwYhqSXJ27ZpSrDoyc= Received: from mx-prod-mc-04.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-433--ayIjcuCPze9ryjYvQt7vA-1; Tue, 27 Aug 2024 14:03:24 -0400 X-MC-Unique: -ayIjcuCPze9ryjYvQt7vA-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C75D11955D4F; Tue, 27 Aug 2024 18:03:21 +0000 (UTC) Received: from fs-i40c-03.mgmt.fast.eng.rdu2.dc.redhat.com (fs-i40c-03.mgmt.fast.eng.rdu2.dc.redhat.com [10.6.24.150]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7C8861955F1B; Tue, 27 Aug 2024 18:03:18 +0000 (UTC) From: Alexander Aring To: teigland@redhat.com Cc: gfs2@lists.linux.dev, song@kernel.org, yukuai3@huawei.com, agruenba@redhat.com, mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com, gregkh@linuxfoundation.org, rafael@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, ocfs2-devel@lists.linux.dev, netdev@vger.kernel.org, vvidic@valentin-vidic.from.hr, heming.zhao@suse.com, lucien.xin@gmail.com, paulmck@kernel.org, rcu@vger.kernel.org, juri.lelli@redhat.com, williams@redhat.com, aahringo@redhat.com Subject: [RFC 6/7] dlm: add more tracepoints for DLM kernel verifier Date: Tue, 27 Aug 2024 14:02:35 -0400 Message-ID: <20240827180236.316946-7-aahringo@redhat.com> In-Reply-To: <20240827180236.316946-1-aahringo@redhat.com> References: <20240827180236.316946-1-aahringo@redhat.com> Precedence: bulk X-Mailing-List: ocfs2-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 This patch adds more useful tracepoints for the kernel verifier. The lock/unlock validation tracepoints are useful to store the request state mode that the lock must change to, at this time the lock request cannot fail anymore. (It can fail but there might be upcoming changes because we can't deal with that e.g. -ENOMEM cases). Another tracepoint is dlm_release_lockspace() that signals us that a node is leaving the lockspace and all locks holding should be dropped. Signed-off-by: Alexander Aring --- fs/dlm/lock.c | 10 +++-- fs/dlm/lockspace.c | 4 ++ include/trace/events/dlm.h | 80 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 3 deletions(-) diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 21bb9603a0df..597418cba76a 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -2811,7 +2811,8 @@ static int set_unlock_args(uint32_t flags, void *astarg, struct dlm_args *args) } static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, - struct dlm_args *args) + struct dlm_args *args, const char *res_name, + size_t res_length) { int rv = -EBUSY; @@ -2845,6 +2846,7 @@ static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, lkb->lkb_lvbptr = args->lksb->sb_lvbptr; lkb->lkb_ownpid = (int) current->pid; lkb->lkb_rv_mode = args->mode; + trace_dlm_lock_validated(ls, lkb, args, res_name, res_length); rv = 0; out: switch (rv) { @@ -2988,6 +2990,7 @@ static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args) lkb->lkb_exflags |= args->flags; dlm_set_sbflags_val(lkb, 0); lkb->lkb_astparam = args->astparam; + trace_dlm_unlock_validated(ls, lkb, args); rv = 0; out: switch (rv) { @@ -3264,7 +3267,7 @@ static int request_lock(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_rsb *r; int error; - error = validate_lock_args(ls, lkb, args); + error = validate_lock_args(ls, lkb, args, name, len); if (error) return error; @@ -3295,7 +3298,8 @@ static int convert_lock(struct dlm_ls *ls, struct dlm_lkb *lkb, hold_rsb(r); lock_rsb(r); - error = validate_lock_args(ls, lkb, args); + error = validate_lock_args(ls, lkb, args, r->res_name, + r->res_length); if (error) goto out; diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index 092f7017b896..c19d797264c5 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -9,6 +9,8 @@ ******************************************************************************* ******************************************************************************/ +#include + #include #include @@ -781,6 +783,8 @@ static int release_lockspace(struct dlm_net *dn, struct dlm_ls *ls, int force) return rv; } + trace_dlm_release_lockspace(dn->our_node->id, ls->ls_global_id); + if (dn->ls_count == 1) dlm_midcomms_version_wait(ls->ls_dn); diff --git a/include/trace/events/dlm.h b/include/trace/events/dlm.h index f8d7ca451760..facad6251e43 100644 --- a/include/trace/events/dlm.h +++ b/include/trace/events/dlm.h @@ -338,6 +338,86 @@ TRACE_EVENT(dlm_unlock_end, ); +TRACE_EVENT(dlm_release_lockspace, + + TP_PROTO(unsigned int our_nodeid, __u32 ls_id), + + TP_ARGS(our_nodeid, ls_id), + + TP_STRUCT__entry( + __field(unsigned int, our_nodeid) + __field(__u32, ls_id) + ), + + TP_fast_assign( + __entry->our_nodeid = our_nodeid; + __entry->ls_id = ls_id; + ), + + TP_printk("our_nodeid=%u ls_id=%u", + __entry->our_nodeid, __entry->ls_id) + +); + +TRACE_EVENT(dlm_lock_validated, + + TP_PROTO(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_args *args, + const char *res_name, size_t res_length), + + TP_ARGS(ls, lkb, args, res_name, res_length), + + TP_STRUCT__entry( + __field(uint32_t, our_nodeid) + __field(uint32_t, ls_id) + __dynamic_array(unsigned char, res_name, res_length) + __field(int, mode) + ), + + TP_fast_assign( + __entry->our_nodeid = ls->ls_dn->our_node->id; + __entry->ls_id = ls->ls_global_id; + memcpy(__get_dynamic_array(res_name), res_name, + __get_dynamic_array_len(res_name)); + __entry->mode = args->mode; + ), + + TP_printk("our_nodeid=%u ls_id=%u res_name=%s mode=%d", + __entry->our_nodeid, __entry->ls_id, + __print_hex_str(__get_dynamic_array(res_name), + __get_dynamic_array_len(res_name)), + __entry->mode) + +); + +TRACE_EVENT(dlm_unlock_validated, + + TP_PROTO(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_args *args), + + TP_ARGS(ls, lkb, args), + + TP_STRUCT__entry( + __field(uint32_t, our_nodeid) + __field(uint32_t, ls_id) + __dynamic_array(unsigned char, res_name, + lkb->lkb_resource->res_length) + ), + + TP_fast_assign( + struct dlm_rsb *r = lkb->lkb_resource; + + __entry->our_nodeid = ls->ls_dn->our_node->id; + __entry->ls_id = ls->ls_global_id; + memcpy(__get_dynamic_array(res_name), r->res_name, + __get_dynamic_array_len(res_name)); + ), + + TP_printk("our_nodeid=%u ls_id=%u res_name=%s", + __entry->our_nodeid, __entry->ls_id, + __print_hex_str(__get_dynamic_array(res_name), + __get_dynamic_array_len(res_name))) + +); + DECLARE_EVENT_CLASS(dlm_rcom_template, TP_PROTO(uint32_t dst, uint32_t h_seq, const struct dlm_rcom *rc),