From patchwork Tue Oct 22 14:48:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Donnelly X-Patchwork-Id: 13845771 Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1411A19E836 for ; Tue, 22 Oct 2024 14:49:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729608557; cv=none; b=ViLzPVRhM6DAcy4b1XyVEZXz5OFUqVryIvo8rLmln8xYVWvTafcg6YDPWq/5cfATU2z4Qe22qk0aUmsPk3OtHulLQtIuheHcpLXNis+KQUHt2KanCEuJLNh8N06MscivegKkClXa1Lp+sTdTi1nME5u/o72BwMKPLJzS9Gh0BzQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729608557; c=relaxed/simple; bh=lFchxuWYdoChXXQRufyH2iiBvFGz6l9XBMUrcB9WM6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rY4j4KtFqdAwHmYjmbi0Z8qGvl2caGOXBNiF3xefTf1I3XUs5KMJSGMmxgdvsLN2h1jtepDBcM/b1CSjcae2t8oaQUkySxHqRgGyEg1TAfbIhbL/ynxK7g/AG6t5uK+tZ8sS91mTxTm3yyeqjwzDjgFrasP+pTw+5NItBkvivdI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=batbytes.com; spf=none smtp.mailfrom=batbytes.com; dkim=pass (2048-bit key) header.d=batbytes-com.20230601.gappssmtp.com header.i=@batbytes-com.20230601.gappssmtp.com header.b=euFVfnXv; arc=none smtp.client-ip=209.85.161.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=batbytes.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=batbytes.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=batbytes-com.20230601.gappssmtp.com header.i=@batbytes-com.20230601.gappssmtp.com header.b="euFVfnXv" Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-5ebc05007daso1338428eaf.1 for ; Tue, 22 Oct 2024 07:49:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=batbytes-com.20230601.gappssmtp.com; s=20230601; t=1729608555; x=1730213355; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qKaj8XArk4+aUuXdEGwzY4pbQVUlMNZ2d7arPW6y4hE=; b=euFVfnXvL3lY+cdxbzYrRV7OwKEvHrB729WWGf1MgUkeePZSHGSTXqbdWhYcRRqq+y cOKZW4KxK5rJD9ET3ieYlk/xS9KlTlFmG8ElqqQPGveXuxJI/v328m0w119/1bFTNVxF CCBEhoEa92U5XwVi8VfKVwL7ojdLvcOXcSFv2xzXPi+obqvq5xcyzlEHnFdDzk2XymWg dEucFuD1FJYzPPpP8tH8mAjG4VxGzdHiVAuA2pqfaBaP6ageIBh50ZBJX8KRNLrB5B25 K2HtgB/JHL7NZh5l5ge4fX++oCLUPMmC1jsKi30mEQBtYassSqffEiTlpp2+WOwA8dzg scCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729608555; x=1730213355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qKaj8XArk4+aUuXdEGwzY4pbQVUlMNZ2d7arPW6y4hE=; b=KQn7m4IyMvuzBSAL0amnbpDDHtSNN9v+eKcdmo4uaS6Ig6QFykYmJNfaiUDqsvkQSv xfJSHOqBwvtTR4X9EEZPPPcbJtE9aK7LaK0aYeiPaxfvIQtF8VnX/2ddZX4lAVgDNNnA nJKpCOxZSfbocoDpql6VFAeY0/nO+goh7jxWySgZt8BBjYOA/TinLZ7l5d115V7jmjWO OxiRQgkEiQk84QHLR6vphtfKwkiMaV+b8/+MbGrR7J/9nWROq39pXRnkmSkpf2Z+BvPZ FT7CSeWvmuQUuDlN4FKFaTb5joHVLuleLAgddaw6RQ9FJFArv9FeMEhlfSHomRowBt5q WXCw== X-Forwarded-Encrypted: i=1; AJvYcCWLoGLr1y1GHIM3A8stQ0T164i10lxMINYwkyHRf5XryfiCT8VVrRKfvAkZBLfUttfQrhoLz/XBC8Hf@vger.kernel.org X-Gm-Message-State: AOJu0YwRMPWE2FtNmZkDn3pPusI839KswDY0NZll43r/r69p01QjVW21 6KfmdDl6PfdPolsl8onVFhEF0f6fCTK1UW74VeoocxVQQ8U8l9HnpbZjeHtNtA== X-Google-Smtp-Source: AGHT+IEwaVAWGLfmNMr+lJeaJ8Yjtm1v6/BmAIKrS4HDg/0jFnT+ZsEs65PuzbPkJaDPNgiT6tOGMw== X-Received: by 2002:a05:6358:311b:b0:1c3:7503:86bd with SMTP id e5c5f4694b2df-1c3cd4f3699mr170166855d.14.1729608555009; Tue, 22 Oct 2024 07:49:15 -0700 (PDT) Received: from batbytes.com ([216.212.123.7]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6ce008fb5e0sm29567476d6.33.2024.10.22.07.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 07:49:14 -0700 (PDT) From: Patrick Donnelly To: Xiubo Li , Ilya Dryomov Cc: Patrick Donnelly , Patrick Donnelly , ceph-devel@vger.kernel.org (open list:CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/3] ceph: correct ceph_mds_cap_item field name Date: Tue, 22 Oct 2024 10:48:33 -0400 Message-ID: <20241022144838.1049499-2-batrick@batbytes.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022144838.1049499-1-batrick@batbytes.com> References: <20241022144838.1049499-1-batrick@batbytes.com> Precedence: bulk X-Mailing-List: ceph-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The issue_seq is sent with bulk cap releases, not the current sequence number. See also ceph.git commit: "include/ceph_fs: correct ceph_mds_cap_item field name". See-also: https://tracker.ceph.com/issues/66704 Signed-off-by: Patrick Donnelly --- fs/ceph/mds_client.c | 2 +- include/linux/ceph/ceph_fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index c4a5fd94bbbb..0be82de8a6da 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2362,7 +2362,7 @@ static void ceph_send_cap_releases(struct ceph_mds_client *mdsc, item->ino = cpu_to_le64(cap->cap_ino); item->cap_id = cpu_to_le64(cap->cap_id); item->migrate_seq = cpu_to_le32(cap->mseq); - item->seq = cpu_to_le32(cap->issue_seq); + item->issue_seq = cpu_to_le32(cap->issue_seq); msg->front.iov_len += sizeof(*item); ceph_put_cap(mdsc, cap); diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h index ee1d0e5f9789..4ff3ad5e9210 100644 --- a/include/linux/ceph/ceph_fs.h +++ b/include/linux/ceph/ceph_fs.h @@ -822,7 +822,7 @@ struct ceph_mds_cap_release { struct ceph_mds_cap_item { __le64 ino; __le64 cap_id; - __le32 migrate_seq, seq; + __le32 migrate_seq, issue_seq; } __attribute__ ((packed)); #define CEPH_MDS_LEASE_REVOKE 1 /* mds -> client */ From patchwork Tue Oct 22 14:48:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Donnelly X-Patchwork-Id: 13845772 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 575021A2651 for ; Tue, 22 Oct 2024 14:49:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729608559; cv=none; b=eofeMRtbMKmF+XeVRXCmNZPhbEdiP21gHvYkofqtLBc1r3vJZTeV35YNcCbnnbgE7SES1vHhVBytlJB+DUFzaRYJHMTZkwghHUhZEfNRSoWuR9XNC/H/7TVwISEg5ileG6yTPthnngVWrNSTF3Pcj30LikV6FC2UJsqg2WpjvPI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729608559; c=relaxed/simple; bh=B4/JBdGM31QVKWtGy9/jYiS1rDqbLwKvIygE6O9yYRI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kq5//ByvKnYlAMYcGYLCU24U5LPQn10yBfanHfBP37zR+baFd7a78uDV/Pv4uvnW01PHR3PcnxhvccISgN8Z98hhmHLVvMMlZRXfSi6obyUeOtmO6ibRkLp1pIMktivolQN+pQH9uJdUoTgOpqg4sdEoe5Ikz6H+vYS9HA/8250= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=batbytes.com; spf=none smtp.mailfrom=batbytes.com; dkim=pass (2048-bit key) header.d=batbytes-com.20230601.gappssmtp.com header.i=@batbytes-com.20230601.gappssmtp.com header.b=mXlTSl1f; arc=none smtp.client-ip=209.85.219.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=batbytes.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=batbytes.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=batbytes-com.20230601.gappssmtp.com header.i=@batbytes-com.20230601.gappssmtp.com header.b="mXlTSl1f" Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-6cbd550b648so41668696d6.0 for ; Tue, 22 Oct 2024 07:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=batbytes-com.20230601.gappssmtp.com; s=20230601; t=1729608557; x=1730213357; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ao33/Ao6F4cGAA89YWrjFOas+y1/CWWJL3mox+XBbjc=; b=mXlTSl1fnTW0aUFzgbuwqW0N6nlgDP8fdzi5Y72/c16b5czYfey1C9MFd+1cknohik 0DVhjSP1CsoknxMWZdpjZ6SAjgl5QKDRbKTodsTpj1l9EA9RDHwbjD+00euZ90MzmKlN RLAiCvmC7VlpMX5dmSmvqm6vtju7gz+BH8IcXyusoZrWPKSEhyBhXlDVKh3W8gTx9poM ocDrES5FVD3hZB5p3aN0UV6AIZkyUCWnd0JNOVe1z28URgqKCmAgi5BfS0s/RSKpwLlC Bub4sFTSPQ+5Pbdm3VESUKbM1DretIbbOASdA9ptmKp4aqf+2+8SHiK+YRsfG3rYejKr cZfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729608557; x=1730213357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ao33/Ao6F4cGAA89YWrjFOas+y1/CWWJL3mox+XBbjc=; b=i9sBHRjsRdOv8GY+9v8QztBil9AMkD9Fh9m0r5tumnE+ojvE3J5WBUIE601R4y8Edv 2tdYg7tqoAOazKU/2l3vT99Q5JVv2fnmlVdTMJ9FLkFZSM5/9wgS5o9k58D5R0V4ns5j ZS1aXUdN+jpW0CffmgfDVU7PKfzxDRVVi6b3MSam/Auyjx+fgt5VoNq9zLzqbaR7jBjq d6AAEFjT7imznqDCrwb9ayIlR9KAyNaJNAKbky4MlsJ9ub8LAhcggbi14KovuY3lGMkS rL3FxBU/jqdTXQTAPA5fRCpVhdsuXBOdwBGlH8Z+aJVcNNngWC0dbWBbTlJWJXh5aIWQ okMw== X-Forwarded-Encrypted: i=1; AJvYcCUqabIk7SrtdmT5AM4qy8gOVMNE0IJbvrWvKkTSFbG4kE1JP3Qsguuo0OOH7gvk8xowPuBRpYYqm3c3@vger.kernel.org X-Gm-Message-State: AOJu0YxPzecayHPV7luvcGVUGQEKSZjQ3THzcbQHGR4z6w1lcHWxLTfk qj1iW4EyKONQt2k2sF5LLezuIb8evS2lVZiFWRUzfJ4+qMtIyouW6wCBTUofxw== X-Google-Smtp-Source: AGHT+IEQvf5cTMPWOx5JdiKcQp2p2AUl+navPVpwui70L5Ta37U4YKujOI9u35XkgTY1mpQRh+hL+g== X-Received: by 2002:a05:6214:2dc8:b0:6cb:5418:4523 with SMTP id 6a1803df08f44-6cde15d31a9mr294382766d6.40.1729608557223; Tue, 22 Oct 2024 07:49:17 -0700 (PDT) Received: from batbytes.com ([216.212.123.7]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6ce008fb5e0sm29567476d6.33.2024.10.22.07.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 07:49:16 -0700 (PDT) From: Patrick Donnelly To: Xiubo Li , Ilya Dryomov Cc: Patrick Donnelly , Patrick Donnelly , ceph-devel@vger.kernel.org (open list:CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/3] ceph: correct ceph_mds_cap_peer field name Date: Tue, 22 Oct 2024 10:48:34 -0400 Message-ID: <20241022144838.1049499-3-batrick@batbytes.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022144838.1049499-1-batrick@batbytes.com> References: <20241022144838.1049499-1-batrick@batbytes.com> Precedence: bulk X-Mailing-List: ceph-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 See also ceph.git commit: "include/ceph_fs: correct ceph_mds_cap_peer field name". See-also: https://tracker.ceph.com/issues/66704 Signed-off-by: Patrick Donnelly --- fs/ceph/caps.c | 23 ++++++++++++----------- include/linux/ceph/ceph_fs.h | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index bed34fc11c91..88a674cf27a8 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -4086,17 +4086,17 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, struct ceph_inode_info *ci = ceph_inode(inode); u64 t_cap_id; unsigned mseq = le32_to_cpu(ex->migrate_seq); - unsigned t_seq, t_mseq; + unsigned t_issue_seq, t_mseq; int target, issued; int mds = session->s_mds; if (ph) { t_cap_id = le64_to_cpu(ph->cap_id); - t_seq = le32_to_cpu(ph->seq); + t_issue_seq = le32_to_cpu(ph->issue_seq); t_mseq = le32_to_cpu(ph->mseq); target = le32_to_cpu(ph->mds); } else { - t_cap_id = t_seq = t_mseq = 0; + t_cap_id = t_issue_seq = t_mseq = 0; target = -1; } @@ -4134,12 +4134,12 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, if (tcap) { /* already have caps from the target */ if (tcap->cap_id == t_cap_id && - ceph_seq_cmp(tcap->seq, t_seq) < 0) { + ceph_seq_cmp(tcap->seq, t_issue_seq) < 0) { doutc(cl, " updating import cap %p mds%d\n", tcap, target); tcap->cap_id = t_cap_id; - tcap->seq = t_seq - 1; - tcap->issue_seq = t_seq - 1; + tcap->seq = t_issue_seq - 1; + tcap->issue_seq = t_issue_seq - 1; tcap->issued |= issued; tcap->implemented |= issued; if (cap == ci->i_auth_cap) { @@ -4154,7 +4154,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, int flag = (cap == ci->i_auth_cap) ? CEPH_CAP_FLAG_AUTH : 0; tcap = new_cap; ceph_add_cap(inode, tsession, t_cap_id, issued, 0, - t_seq - 1, t_mseq, (u64)-1, flag, &new_cap); + t_issue_seq - 1, t_mseq, (u64)-1, flag, &new_cap); if (!list_empty(&ci->i_cap_flush_list) && ci->i_auth_cap == tcap) { @@ -4268,14 +4268,14 @@ static void handle_cap_import(struct ceph_mds_client *mdsc, doutc(cl, " remove export cap %p mds%d flags %d\n", ocap, peer, ph->flags); if ((ph->flags & CEPH_CAP_FLAG_AUTH) && - (ocap->seq != le32_to_cpu(ph->seq) || + (ocap->seq != le32_to_cpu(ph->issue_seq) || ocap->mseq != le32_to_cpu(ph->mseq))) { pr_err_ratelimited_client(cl, "mismatched seq/mseq: " "%p %llx.%llx mds%d seq %d mseq %d" " importer mds%d has peer seq %d mseq %d\n", inode, ceph_vinop(inode), peer, ocap->seq, ocap->mseq, mds, - le32_to_cpu(ph->seq), + le32_to_cpu(ph->issue_seq), le32_to_cpu(ph->mseq)); } ceph_remove_cap(mdsc, ocap, (ph->flags & CEPH_CAP_FLAG_RELEASE)); @@ -4350,7 +4350,7 @@ void ceph_handle_caps(struct ceph_mds_session *session, struct ceph_snap_realm *realm = NULL; int op; int msg_version = le16_to_cpu(msg->hdr.version); - u32 seq, mseq; + u32 seq, mseq, issue_seq; struct ceph_vino vino; void *snaptrace; size_t snaptrace_len; @@ -4375,6 +4375,7 @@ void ceph_handle_caps(struct ceph_mds_session *session, vino.snap = CEPH_NOSNAP; seq = le32_to_cpu(h->seq); mseq = le32_to_cpu(h->migrate_seq); + issue_seq = le32_to_cpu(h->issue_seq); snaptrace = h + 1; snaptrace_len = le32_to_cpu(h->snap_trace_len); @@ -4598,7 +4599,7 @@ void ceph_handle_caps(struct ceph_mds_session *session, cap->cap_id = le64_to_cpu(h->cap_id); cap->mseq = mseq; cap->seq = seq; - cap->issue_seq = seq; + cap->issue_seq = issue_seq; spin_lock(&session->s_cap_lock); __ceph_queue_cap_release(session, cap); spin_unlock(&session->s_cap_lock); diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h index 4ff3ad5e9210..2d7d86f0290d 100644 --- a/include/linux/ceph/ceph_fs.h +++ b/include/linux/ceph/ceph_fs.h @@ -808,7 +808,7 @@ struct ceph_mds_caps { struct ceph_mds_cap_peer { __le64 cap_id; - __le32 seq; + __le32 issue_seq; __le32 mseq; __le32 mds; __u8 flags; From patchwork Tue Oct 22 14:48:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Donnelly X-Patchwork-Id: 13845773 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC13B1A304A for ; Tue, 22 Oct 2024 14:49:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729608563; cv=none; b=LkE3RBg0YriQiOX0Fln1OhrkaLVFoEoAqdh0Xf+XyXTsWys0JrVgWmJZOFbhQe02cO2ISBfStkNAxUhCudhn3oF/mURjQYFkWMN044c2gObn42EjbrqRMhfBMR2p94pYRQu+U1VzwOm66tYIy3/bwdtnT3O/7mzVSLpvK9po+sc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729608563; c=relaxed/simple; bh=4OEr5DlA2GJoYYQduLmLnz2yUHPnnHV7+HNBrHK40y8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LN/9PQDc+Jn+8etbYZ3CrRuC0rR9lzXpyLBixhUoOPBD9FOj1KLkOLSbm+Cd8X+eUEZHMdxHcOfNGZ8uh+batOSOPVb0qYG3eycGvISUVtwn3Ht888iMbw5lq9C2ZLqjt+xAWOQ5COMUiwCfWcRl1fhdL0/+xLfib6/jfSDSxKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=batbytes.com; spf=none smtp.mailfrom=batbytes.com; dkim=pass (2048-bit key) header.d=batbytes-com.20230601.gappssmtp.com header.i=@batbytes-com.20230601.gappssmtp.com header.b=t7FFmX+K; arc=none smtp.client-ip=209.85.219.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=batbytes.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=batbytes.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=batbytes-com.20230601.gappssmtp.com header.i=@batbytes-com.20230601.gappssmtp.com header.b="t7FFmX+K" Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-6cbcc2bd7fcso32269686d6.1 for ; Tue, 22 Oct 2024 07:49:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=batbytes-com.20230601.gappssmtp.com; s=20230601; t=1729608559; x=1730213359; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JUIHvjCHyF6SlVUAxO2Vzn0YEoHF5gMFXLys0iHDmcY=; b=t7FFmX+KGk9OKSkIJZOJDWrQ5kuJt6OlBJxmBKu09bpSpDAt6mUVbmjrX09eQM9zyF zrkPvvdCP2wVPU55hLTcAUtt+mARuBGGDMhR6fnLu8Yii/LalUSjc2NVG6I8fCcVW8G4 GiC7F/aX40bsJntb9j/Z/Bv0FrcI6dptfrRt28wJL/iTdpEDwHhcycTMy4ekem9sKDam uZnMOSkv5rh7ivtxEAtMOuG0dn7Js9Rw6poxvvNoeATtujVM2BvZIM9nToxyfZGP9pko FzRuSkcQlYexydcEZnJeztjTAmXA56vOB2DvALh2FmKbogg0l3ASHJOnBSWzQVelCGMJ Lk+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729608559; x=1730213359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JUIHvjCHyF6SlVUAxO2Vzn0YEoHF5gMFXLys0iHDmcY=; b=HrkyxQfrhVRcH9QgfeZgsWZtarBCTRSsB7iTdK3WCM3G8TsY0KLdhJjIjjitkJD1UU VFf2341B6S73kTXRfoYwsfh5Udi3bXVe1v7tNHN+PEmAcvuXITbLetFY1+0ylerS9bcb BZrGwqso0tCkEBvo5LkN2+vbKpCYavvWevY+IqyxzUb1yLtIaRNxwOEsmr93DgFtIacc gYR2Wp22tT4+MhuyEpqWMECOEe1tumpb5vC0J9BjhSoHOm7V4zYBMcH0rVrWQ/GFKbUs FtvpT9FJG2izsI6U2T8XxxmwBBzGqJ2YTMKts9CWMGnWUlAxxtm+o/91qaQpDF3XwHrz 7K6w== X-Forwarded-Encrypted: i=1; AJvYcCUzAlex2QvW/XpXqndX6tvsk6hdJOz2XFc4FJoXxkUJYmhzh0qRVNAs2MFMPyhPyct8p5gwBqQgaFWc@vger.kernel.org X-Gm-Message-State: AOJu0YzjdmfsklMQs1AQKnJIwXYc9nXZDLwhxX7rK5wr0krYUFuE2xMm qM8YlW4kURIj/L1pPLjV2eJ06b1x9s3eRbI2DTBbU/L1mLjCnsE4aDqgQB/uyQ== X-Google-Smtp-Source: AGHT+IH3GsDmqjG7wCDqtCT6s5bIQ7bSl7g/uLVQ9ufgCfUrWcFOgQzIsrGJDmIGgT4w6Y6GpQAnMQ== X-Received: by 2002:ad4:4b6e:0:b0:6ce:2f4e:40f1 with SMTP id 6a1803df08f44-6ce2f4e43d0mr10514266d6.26.1729608559507; Tue, 22 Oct 2024 07:49:19 -0700 (PDT) Received: from batbytes.com ([216.212.123.7]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6ce008fb5e0sm29567476d6.33.2024.10.22.07.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 07:49:19 -0700 (PDT) From: Patrick Donnelly To: Xiubo Li , Ilya Dryomov Cc: Patrick Donnelly , ceph-devel@vger.kernel.org (open list:CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/3] ceph: improve caps debugging output Date: Tue, 22 Oct 2024 10:48:35 -0400 Message-ID: <20241022144838.1049499-4-batrick@batbytes.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022144838.1049499-1-batrick@batbytes.com> References: <20241022144838.1049499-1-batrick@batbytes.com> Precedence: bulk X-Mailing-List: ceph-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Patrick Donnelly This improves uniformity and exposes important sequence numbers. Now looks like: <7>[ 73.749563] ceph: caps.c:4465 : [c9653bca-110b-4f70-9f84-5a195b205e9a 15290] caps mds2 op export ino 20000000000.fffffffffffffffe inode 0000000008d2e5ea seq 0 iseq 0 mseq 0 ... <7>[ 73.749574] ceph: caps.c:4102 : [c9653bca-110b-4f70-9f84-5a195b205e9a 15290] cap 20000000000.fffffffffffffffe export to peer 1 piseq 1 pmseq 1 ... <7>[ 73.749645] ceph: caps.c:4465 : [c9653bca-110b-4f70-9f84-5a195b205e9a 15290] caps mds1 op import ino 20000000000.fffffffffffffffe inode 0000000008d2e5ea seq 1 iseq 1 mseq 1 ... <7>[ 73.749681] ceph: caps.c:4244 : [c9653bca-110b-4f70-9f84-5a195b205e9a 15290] cap 20000000000.fffffffffffffffe import from peer 2 piseq 686 pmseq 0 ... <7>[ 248.645596] ceph: caps.c:4465 : [c9653bca-110b-4f70-9f84-5a195b205e9a 15290] caps mds1 op revoke ino 20000000000.fffffffffffffffe inode 0000000008d2e5ea seq 2538 iseq 1 mseq 1 See also: "mds: add issue_seq to all cap messages" in ceph.git See-also: https://tracker.ceph.com/issues/66704 Signed-off-by: Patrick Donnelly --- fs/ceph/caps.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 88a674cf27a8..74ba310dfcc7 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -4085,8 +4085,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, struct ceph_cap *cap, *tcap, *new_cap = NULL; struct ceph_inode_info *ci = ceph_inode(inode); u64 t_cap_id; - unsigned mseq = le32_to_cpu(ex->migrate_seq); - unsigned t_issue_seq, t_mseq; + u32 t_issue_seq, t_mseq; int target, issued; int mds = session->s_mds; @@ -4100,8 +4099,8 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, target = -1; } - doutc(cl, "%p %llx.%llx ci %p mds%d mseq %d target %d\n", - inode, ceph_vinop(inode), ci, mds, mseq, target); + doutc(cl, " cap %llx.%llx export to peer %d piseq %u pmseq %u\n", + ceph_vinop(inode), target, t_issue_seq, t_mseq); retry: down_read(&mdsc->snap_rwsem); spin_lock(&ci->i_ceph_lock); @@ -4228,18 +4227,22 @@ static void handle_cap_import(struct ceph_mds_client *mdsc, u64 realmino = le64_to_cpu(im->realm); u64 cap_id = le64_to_cpu(im->cap_id); u64 p_cap_id; + u32 piseq = 0; + u32 pmseq = 0; int peer; if (ph) { p_cap_id = le64_to_cpu(ph->cap_id); peer = le32_to_cpu(ph->mds); + piseq = le32_to_cpu(ph->issue_seq); + pmseq = le32_to_cpu(ph->mseq); } else { p_cap_id = 0; peer = -1; } - doutc(cl, "%p %llx.%llx ci %p mds%d mseq %d peer %d\n", - inode, ceph_vinop(inode), ci, mds, mseq, peer); + doutc(cl, " cap %llx.%llx import from peer %d piseq %u pmseq %u\n", + ceph_vinop(inode), peer, piseq, pmseq); retry: cap = __get_cap_for_mds(ci, mds); if (!cap) { @@ -4268,15 +4271,13 @@ static void handle_cap_import(struct ceph_mds_client *mdsc, doutc(cl, " remove export cap %p mds%d flags %d\n", ocap, peer, ph->flags); if ((ph->flags & CEPH_CAP_FLAG_AUTH) && - (ocap->seq != le32_to_cpu(ph->issue_seq) || - ocap->mseq != le32_to_cpu(ph->mseq))) { + (ocap->seq != piseq || + ocap->mseq != pmseq)) { pr_err_ratelimited_client(cl, "mismatched seq/mseq: " "%p %llx.%llx mds%d seq %d mseq %d" " importer mds%d has peer seq %d mseq %d\n", inode, ceph_vinop(inode), peer, - ocap->seq, ocap->mseq, mds, - le32_to_cpu(ph->issue_seq), - le32_to_cpu(ph->mseq)); + ocap->seq, ocap->mseq, mds, piseq, pmseq); } ceph_remove_cap(mdsc, ocap, (ph->flags & CEPH_CAP_FLAG_RELEASE)); } @@ -4360,8 +4361,6 @@ void ceph_handle_caps(struct ceph_mds_session *session, bool close_sessions = false; bool do_cap_release = false; - doutc(cl, "from mds%d\n", session->s_mds); - if (!ceph_inc_mds_stopping_blocker(mdsc, session)) return; @@ -4463,12 +4462,11 @@ void ceph_handle_caps(struct ceph_mds_session *session, /* lookup ino */ inode = ceph_find_inode(mdsc->fsc->sb, vino); - doutc(cl, " op %s ino %llx.%llx inode %p\n", ceph_cap_op_name(op), - vino.ino, vino.snap, inode); + doutc(cl, " caps mds%d op %s ino %llx.%llx inode %p seq %u iseq %u mseq %u\n", + session->s_mds, ceph_cap_op_name(op), vino.ino, vino.snap, inode, + seq, issue_seq, mseq); mutex_lock(&session->s_mutex); - doutc(cl, " mds%d seq %lld cap seq %u\n", session->s_mds, - session->s_seq, (unsigned)seq); if (!inode) { doutc(cl, " i don't have ino %llx\n", vino.ino);