From nobody Sat Nov 23 15:09:01 2024 Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) (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 BB2CB1A28C for ; Tue, 19 Nov 2024 02:28:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731983291; cv=none; b=Q12FSPoZhwY++6xPv2dQSbBMgXEJBp1aVZADONud5t6InKZ1oTVLKFEOe/cvSusEH4DVfwTiFdOBbpqoTv5H16CO0hIKeFqUkXM1WwyYhTKmiaHddZ+yx2jLqN2ogb8vE+VMhINZ2uPPA7QSF3dsXxK0DeMj7x4Zp1K3HY1bakc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731983291; c=relaxed/simple; bh=lFchxuWYdoChXXQRufyH2iiBvFGz6l9XBMUrcB9WM6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p3g7zRbCFBIgw/fjhKCTlcFDowRmsBC24n6m1vvKTLHKi2BsZEx9IkfBXsvrGLAwXTGOSOjWJRsMBnbqcwQxfXz1dwFoytHsgjb5+RXAbHRvtSiuhh5MD1yQXpVMiyjbONzxriTu2pf44lO0nRiyff428p/GhqhUQVKTG/MsuaI= 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=1i8Qj1aD; arc=none smtp.client-ip=209.85.219.47 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="1i8Qj1aD" Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-6d416a43160so19783796d6.1 for ; Mon, 18 Nov 2024 18:28:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=batbytes-com.20230601.gappssmtp.com; s=20230601; t=1731983288; x=1732588088; 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=1i8Qj1aDNF4uxJWABUlsRU+FF0C6L/RF1dPUlfAn7qIaGzW1QWQafGnWZAkCtMlbXg B+JiJ+azf9YEWyrVSjndIc8CVFgFuFuVMXxecjUSd/HpFLwtbtNGitbmdf8vYqJd6RXH CD2Kdt7Ss/oMqd8meI9zsYKLJpg5TUvFS38JY1A1YCmU2nnhnvKMOjH17Umf25B+NvqC Rh5VBnWxoEHtKcHqtkhp/VOR1I9JRZFBcBfjkrOTI8/KAOXGg5YP42ftmwrpX77EuqqT KiftiBlD3w8L3bKamDXtKo5GdLT3Pv0ZOgGB+Qj88pObGwH6Pug2zS+40RhwxVLAVv08 FKDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731983288; x=1732588088; 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=KItJpWCSLmqyvSvSmC4Ve7rwdfBcsTzdEYMBEeDymky4eBSKzkv1mPxf+JOZ9Xj4HB GEOGFro6+EFOvZgsvwheZV1WY33/9pDzltPCBSttGYcO10xmsnCQZm6BcUsC5YkH7uEi g7JfDYKvIT2auPtzFREGMVosBZQjiErug0Zt2z3UIz6uxmeGmf8oZ+yXvwt86l2cENvV g6DxpwMRPt+FHj/cCoYSVNDVMt2wsjTuAKGl8CEp1RlHehraG+9JvOFoC/BQBRaQALrO 9rcf3HkAdvAM9oz7+Fdv+C/r4pXPatt4Qn7iyOYZWd8SzlKI2BUx/nrNTGBrumfh9qWh XBUw== X-Forwarded-Encrypted: i=1; AJvYcCXb/JFKG/h6eLdGV6bGyfhKZQavNXBi3svW4x/Fk7cQIE0tmS1lLqyyIA5x6JLnAmhZ5WTyxIGhHGU448c=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2fBaTG05RgO9r2s2qHyxXcp8CvFwEdSecjscThDMpoJ2A1VYD Dr3fJIt4hBQLxzc+5Ui8XHVD8nZ/x9HLl9qCoJmaSpn+L3/Toc6KBsFIq/h9QQ== X-Google-Smtp-Source: AGHT+IEg3a2lAF/vb390FhGCGjUrHn5uq6t+rXalinv1TCOWJl5FeBErqn5lQsxGjjhYGbT4Vi/OvA== X-Received: by 2002:a0c:f807:0:b0:6d4:1e3f:4367 with SMTP id 6a1803df08f44-6d42b8ff1d2mr25243446d6.16.1731983288645; Mon, 18 Nov 2024 18:28:08 -0800 (PST) Received: from batbytes.com ([216.212.123.7]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b37a8a9fdesm48293485a.124.2024.11.18.18.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2024 18:28:07 -0800 (PST) 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 v2 1/3] ceph: correct ceph_mds_cap_item field name Date: Mon, 18 Nov 2024 21:27:48 -0500 Message-ID: <20241119022752.1256662-2-batrick@batbytes.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241119022752.1256662-1-batrick@batbytes.com> References: <20241119022752.1256662-1-batrick@batbytes.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The issue_seq is sent with bulk cap releases, not the current sequence numb= er. 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_cl= ient *mdsc, item->ino =3D cpu_to_le64(cap->cap_ino); item->cap_id =3D cpu_to_le64(cap->cap_id); item->migrate_seq =3D cpu_to_le32(cap->mseq); - item->seq =3D cpu_to_le32(cap->issue_seq); + item->issue_seq =3D cpu_to_le32(cap->issue_seq); msg->front.iov_len +=3D sizeof(*item); =20 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)); =20 #define CEPH_MDS_LEASE_REVOKE 1 /* mds -> client */ --=20 Patrick Donnelly, Ph.D. He / Him / His Red Hat Partner Engineer IBM, Inc. GPG: 19F28A586F808C2402351B93C3301A3E258DD79D From nobody Sat Nov 23 15:09:01 2024 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (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 E332A1428F1 for ; Tue, 19 Nov 2024 02:28:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731983293; cv=none; b=no5Ny76gy9gzTF3VqmRqNPuddV+rDg2u4zD49Gf/Iymg0PGSwruRUwHFI6osmvmk9Fj3vpd95XWEwZ5QElTWGOvVmNTZbhF1tzOgNlljPdKxk0bi543M5VbLkNsZWicbZ5bEh3D4NDtkcN6lHqTzIXqTBZGyUce5fu/TSuRv0gM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731983293; c=relaxed/simple; bh=j5OqzA808wGEP+bKAmEuOLSp0ilqpAKOPXYB3RrPwFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uUHfqeuuPYo6INfniFoBvEauKHkDqTdtv39CwseJZSkzn3vPghttRTib3iADf3Ed7g1EppFRE5ZCDyqfec4qUNFcN1RLA7G7rIbTYYz57z9a53ALjlsDI9my4pgXZ0nwqlkSIyjUvVJw0h7GBnVqrNBavh1B65CVpdVHbEM18Sg= 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=b/IKcUX0; arc=none smtp.client-ip=209.85.222.177 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="b/IKcUX0" Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-7b1488fde46so22893185a.2 for ; Mon, 18 Nov 2024 18:28:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=batbytes-com.20230601.gappssmtp.com; s=20230601; t=1731983291; x=1732588091; 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=LoKHGpIVEQElQT2i7Eoq44Yb2XIPlFWQJI91QoJIm0s=; b=b/IKcUX0tRAWD5TRB1/DNmfYSqO98lSamyIbrqnB0QiGTpJ8436ZoVPgEQhPGrkZ29 lKQFspam66NKrjknzL2sZniohNvFx1BSnODZJuZRPTtQoM8D5VvVLETr0vJ1vTLWBV7Q a98lspKvvWsmJk4B1nugxbi4toFRsCSJkiY20TUJ6GSwink85BAjeIvegLGEQxGG3ezH PL/+RWcnfmaxp0NumjDbwABKpBnR6h6dDNgJ15b8n1ihGQV2qOuSpcQQXcnWw8xdUJ9A wJkv/FGwIk+cz1j9+uFfRJnzYi0EFUMlGi+w6s6JroZjGhpVqHBTFsJAwNhPe9uebYS3 Jigw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731983291; x=1732588091; 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=LoKHGpIVEQElQT2i7Eoq44Yb2XIPlFWQJI91QoJIm0s=; b=pawxsWlPTZXxmh6SYD7FN0lhpCqS1hCybpFF47jzn00zz34TJPEiWPDnjKIk2BRKpe xz61YtNFECCMqp+IZ1mvlSpmkUiO2H/vhqqDTHiC41IVJaOKKM4IW2zQvud5Pt9miZPJ lKjvd8HB5xBg1HD/VrdgpCdfoiZxw7CapjE8KYBmwoBphelzWMKFFIjFPiBBWszq1+3J h15hG2PBXiL16RpDnDULYQH0kgpdmVgBhnvXtbw3DzYU7WjJ3kOjyc+mL6++n5GYf+Vk eP2t0/Fhla4SXjoVDG1pkpNyj+wCeV1iDW/D5krAdWujle59Syk3IgIIQ/CqHW0XKpB3 SFcA== X-Forwarded-Encrypted: i=1; AJvYcCVs/ECXE8UUmc5laiTFy6nf331PwfuuBmK09gtJqpwwQvVbn+8sFOxbXb9yrgQo7fndXLlFwbTSXG3mKqI=@vger.kernel.org X-Gm-Message-State: AOJu0YwB0TsfmMnWTb5PgLU4D0cp752I7V/qqBOq7nUUARwARnH5L/26 OIO8peYOnHgW8TRNQUq+tJoa9knRl+kpxGY+GCG3VpN+fZTTWtWUl7NRRZU1Bw== X-Google-Smtp-Source: AGHT+IH24L6W1WFxX10+OPV06uTEfQ35DE7BpeSJuTuXfhwSsQwDw7jOTD7+koW8z0c9fbohlEJ16w== X-Received: by 2002:a05:620a:1a18:b0:7ac:b3bf:c30b with SMTP id af79cd13be357-7b3622ce775mr2170267885a.32.1731983290965; Mon, 18 Nov 2024 18:28:10 -0800 (PST) Received: from batbytes.com ([216.212.123.7]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b37a8a9fdesm48293485a.124.2024.11.18.18.28.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2024 18:28:09 -0800 (PST) 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 v2 2/3] ceph: correct ceph_mds_cap_peer field name Date: Mon, 18 Nov 2024 21:27:49 -0500 Message-ID: <20241119022752.1256662-3-batrick@batbytes.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241119022752.1256662-1-batrick@batbytes.com> References: <20241119022752.1256662-1-batrick@batbytes.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 | 18 +++++++++--------- include/linux/ceph/ceph_fs.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index bed34fc11c91..27410bc9ce15 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 =3D ceph_inode(inode); u64 t_cap_id; unsigned mseq =3D le32_to_cpu(ex->migrate_seq); - unsigned t_seq, t_mseq; + unsigned t_issue_seq, t_mseq; int target, issued; int mds =3D session->s_mds; =20 if (ph) { t_cap_id =3D le64_to_cpu(ph->cap_id); - t_seq =3D le32_to_cpu(ph->seq); + t_issue_seq =3D le32_to_cpu(ph->issue_seq); t_mseq =3D le32_to_cpu(ph->mseq); target =3D le32_to_cpu(ph->mds); } else { - t_cap_id =3D t_seq =3D t_mseq =3D 0; + t_cap_id =3D t_issue_seq =3D t_mseq =3D 0; target =3D -1; } =20 @@ -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 =3D=3D 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 =3D t_cap_id; - tcap->seq =3D t_seq - 1; - tcap->issue_seq =3D t_seq - 1; + tcap->seq =3D t_issue_seq - 1; + tcap->issue_seq =3D t_issue_seq - 1; tcap->issued |=3D issued; tcap->implemented |=3D issued; if (cap =3D=3D ci->i_auth_cap) { @@ -4154,7 +4154,7 @@ static void handle_cap_export(struct inode *inode, st= ruct ceph_mds_caps *ex, int flag =3D (cap =3D=3D ci->i_auth_cap) ? CEPH_CAP_FLAG_AUTH : 0; tcap =3D 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); =20 if (!list_empty(&ci->i_cap_flush_list) && ci->i_auth_cap =3D=3D tcap) { @@ -4268,14 +4268,14 @@ static void handle_cap_import(struct ceph_mds_clien= t *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 !=3D le32_to_cpu(ph->seq) || + (ocap->seq !=3D le32_to_cpu(ph->issue_seq) || ocap->mseq !=3D 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)); 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 { =20 struct ceph_mds_cap_peer { __le64 cap_id; - __le32 seq; + __le32 issue_seq; __le32 mseq; __le32 mds; __u8 flags; --=20 Patrick Donnelly, Ph.D. He / Him / His Red Hat Partner Engineer IBM, Inc. GPG: 19F28A586F808C2402351B93C3301A3E258DD79D From nobody Sat Nov 23 15:09:01 2024 Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) (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 8586C13B280 for ; Tue, 19 Nov 2024 02:28:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731983295; cv=none; b=nlJXu8y3Cy2bQTQj9ElPZ3zJu1hVYHQeB/AmhjBEu/RrePdjA+3y4uZHygJlRViT0ySIketo81Nc+wjIvskkEcjistpLSECrv7Ma0Ff1vt1KBRNoZYA+1YCI1D1VSmtNIppXcxaCW4ezGmAzAMVT8kCRuV4hz6T/SI79KMM6sZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731983295; c=relaxed/simple; bh=UccQ+prik4fjQkC8oH/YJPmgnEYnbjg/FRuiAZaLDKk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KcdbtSAtDjCTM48RDtALcbHj0Yjjbp8LGTdHLDTw0t66gX3BKuZJYi6KCqv0VUKY741bWXYrOb+fD5pinecYPsVXQkiVka72tQjcV3rcmZ/WuAktKzOvSjQsGQ8tiZBCdvM/wgiDKT5WmHPirEpA3jD9pK7vuvLyroGs28bauBs= 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=NzHdh1fd; arc=none smtp.client-ip=209.85.219.47 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="NzHdh1fd" Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-6d40e69577dso2919236d6.3 for ; Mon, 18 Nov 2024 18:28:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=batbytes-com.20230601.gappssmtp.com; s=20230601; t=1731983292; x=1732588092; 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=Hi9UHqDjN8Ni6rhq09eAG7OKaykNr6weeLf4m29aeTQ=; b=NzHdh1fdUPWgGcBCU2JOLeTc3LZkaARV1dJjT3KLJXHyNa4ArQ8MERYAxfY9+FfNB6 KE3BQthteZuV2mhcpkn/3qZ645kVFjALSR4AURxaeZoqngUssPvreD1Kao8IFbSSMHu/ t8Fm5sjr4sJVdNsYg4XhxYutwYbxYSuP064zqiyfVEINCTl4be4xlyR/QjVCk36RazyO bEVm1/AlOpUCCA0cEpaUvcdHhvZ04rGZ/CannL2aLmr4BRwTmAG+aAxIT/TjuF+qcC2C czKdkeUIwokIqs9Vte1fQfKtf4KM0EUqFT7ulLt1Pp2poP/JqTplH7tAkG0p6mXCt+Bl gqPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731983292; x=1732588092; 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=Hi9UHqDjN8Ni6rhq09eAG7OKaykNr6weeLf4m29aeTQ=; b=BPFQHYNmkWl2ZgF4hdW7hMykYTrVp5gs9VWF/3K/7LK72nR8+NhUFjKqHmJnoMEtv4 IHng0YkQYxUw9GcEXWmH5fuzAyzbdQtbBN3fOKtUSiGO7WuUsaBVYHvn1WVe7hFwXUu4 aF2qIT0FZwuF8lyYk5Pz7vEr+q/a6EWWe49siuYLCulgNwzfpLjsveBBVPK2AnVWZ/ut HDSE5Dx7nWrJq60KEtCs4CFxdKJBw0mNvfY8uOOhH+T7dot+XsDxyV6SjsX0fumYpG4Z gGnEW+lASU63nU+X7k5ePs6yZPmeSJfmBNx04mXpQ9eety+nVAb6s/Cv/Wj3Mj3vyOH4 Q+Pw== X-Forwarded-Encrypted: i=1; AJvYcCVMyE2NQgbPczklzmyg87vicFgtyo2lQ6OuCqYkaEXIuLJYnclOAXO0lKxr1KR851Q/BhPiLKEkCeKUDvE=@vger.kernel.org X-Gm-Message-State: AOJu0YzqRvhhimV8UUJH4GZnbgBhujfeG7vm+ybUyduKdCtxII79BPjT 21YgaRsszF6viYoUbYgVSVFTjg/5A3DHtpVGsrGSEffL04PG+P5Lw9+yTWJCSQ== X-Google-Smtp-Source: AGHT+IGWVd9s0tTOzkt/L9+H/nMMqNCNUSOHI3hwM03OUxXzbfjHm/cnEHga8/2MuOW51g+LHySeXg== X-Received: by 2002:a05:6214:2029:b0:6d4:f77:613c with SMTP id 6a1803df08f44-6d40f776480mr185856656d6.25.1731983292642; Mon, 18 Nov 2024 18:28:12 -0800 (PST) Received: from batbytes.com ([216.212.123.7]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b37a8a9fdesm48293485a.124.2024.11.18.18.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2024 18:28:12 -0800 (PST) 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 v2 3/3] ceph: improve caps debugging output Date: Mon, 18 Nov 2024 21:27:50 -0500 Message-ID: <20241119022752.1256662-4-batrick@batbytes.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241119022752.1256662-1-batrick@batbytes.com> References: <20241119022752.1256662-1-batrick@batbytes.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Patrick Donnelly This improves uniformity and exposes important sequence numbers. Now looks like: <7>[ 73.749563] ceph: caps.c:4465 : [c9653bca-110b-4f70-9f8= 4-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-9f8= 4-5a195b205e9a 15290] cap 20000000000.fffffffffffffffe export to peer 1 pi= seq 1 pmseq 1 ... <7>[ 73.749645] ceph: caps.c:4465 : [c9653bca-110b-4f70-9f8= 4-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-9f8= 4-5a195b205e9a 15290] cap 20000000000.fffffffffffffffe import from peer 2 = piseq 686 pmseq 0 ... <7>[ 248.645596] ceph: caps.c:4465 : [c9653bca-110b-4f70-9f8= 4-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 | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 27410bc9ce15..810abf6f7d2c 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -4085,8 +4085,7 @@ static void handle_cap_export(struct inode *inode, st= ruct ceph_mds_caps *ex, struct ceph_cap *cap, *tcap, *new_cap =3D NULL; struct ceph_inode_info *ci =3D ceph_inode(inode); u64 t_cap_id; - unsigned mseq =3D le32_to_cpu(ex->migrate_seq); - unsigned t_issue_seq, t_mseq; + u32 t_issue_seq, t_mseq; int target, issued; int mds =3D session->s_mds; =20 @@ -4100,8 +4099,8 @@ static void handle_cap_export(struct inode *inode, st= ruct ceph_mds_caps *ex, target =3D -1; } =20 - 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_clien= t *mdsc, u64 realmino =3D le64_to_cpu(im->realm); u64 cap_id =3D le64_to_cpu(im->cap_id); u64 p_cap_id; + u32 piseq =3D 0; + u32 pmseq =3D 0; int peer; =20 if (ph) { p_cap_id =3D le64_to_cpu(ph->cap_id); peer =3D le32_to_cpu(ph->mds); + piseq =3D le32_to_cpu(ph->issue_seq); + pmseq =3D le32_to_cpu(ph->mseq); } else { p_cap_id =3D 0; peer =3D -1; } =20 - 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 =3D __get_cap_for_mds(ci, mds); if (!cap) { @@ -4268,15 +4271,13 @@ static void handle_cap_import(struct ceph_mds_clien= t *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 !=3D le32_to_cpu(ph->issue_seq) || - ocap->mseq !=3D le32_to_cpu(ph->mseq))) { + (ocap->seq !=3D piseq || + ocap->mseq !=3D 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)); } @@ -4350,7 +4351,7 @@ void ceph_handle_caps(struct ceph_mds_session *sessio= n, struct ceph_snap_realm *realm =3D NULL; int op; int msg_version =3D le16_to_cpu(msg->hdr.version); - u32 seq, mseq; + u32 seq, mseq, issue_seq; struct ceph_vino vino; void *snaptrace; size_t snaptrace_len; @@ -4360,8 +4361,6 @@ void ceph_handle_caps(struct ceph_mds_session *sessio= n, bool close_sessions =3D false; bool do_cap_release =3D false; =20 - doutc(cl, "from mds%d\n", session->s_mds); - if (!ceph_inc_mds_stopping_blocker(mdsc, session)) return; =20 @@ -4375,6 +4374,7 @@ void ceph_handle_caps(struct ceph_mds_session *sessio= n, vino.snap =3D CEPH_NOSNAP; seq =3D le32_to_cpu(h->seq); mseq =3D le32_to_cpu(h->migrate_seq); + issue_seq =3D le32_to_cpu(h->issue_seq); =20 snaptrace =3D h + 1; snaptrace_len =3D le32_to_cpu(h->snap_trace_len); @@ -4462,12 +4462,11 @@ void ceph_handle_caps(struct ceph_mds_session *sess= ion, =20 /* lookup ino */ inode =3D 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); =20 mutex_lock(&session->s_mutex); - doutc(cl, " mds%d seq %lld cap seq %u\n", session->s_mds, - session->s_seq, (unsigned)seq); =20 if (!inode) { doutc(cl, " i don't have ino %llx\n", vino.ino); --=20 Patrick Donnelly, Ph.D. He / Him / His Red Hat Partner Engineer IBM, Inc. GPG: 19F28A586F808C2402351B93C3301A3E258DD79D