From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795022967; b=xVQzCFOpDdUIzKnNixHXudoaMdI0sTqC3WW+0Vz0qsE4vpc1Ta2U0ybd0VIZFhtTN6/L D0Ha9HYLOwnvCA97Og5YjugHrYHHM7jdbudF0JgzmaCbphqI4GTT86uP9J5B+Slkr4feb fteGr8Io1ysDAZdz0/xfJ64y2LKBZwQOk2hi8ldhjx74QvHHJ2soWBGRIWt8uwKj5/yPa L3+XWjPpYhUazKH3rnIoQUPg8ZpQPl8UkyV1JBsEn/7gh3tuCrIN61yXRQtsahGIYHNkN acUkaE2kVeX++ohAXK+6L7ktnwtk2wLv6TXXbRZ7NInYvt4D/nCqhtxNcQDfh5grEnA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795022967; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=uPVdVsZhLsr4MqmqO4C5KFctNXGUWtPZZa65uwGzH6I=; b=oQRyHUqy/oOINZLVFI8GtidBq3g8ZB/tzZExuWrlEi83hFCXLsFJwyHKa3qQczsMTg4a 6VvMGWFGJqqWwcLvnOobOjvmU1wHvUrhAdsHgH4UzZu+3kmEEPLCFFFcRqRMvCRexRa5q 6e/40IDxkMFf3OKnOuj+iI0TBgpfddbp0CT4XB9U/5CLjyT1MryylGxIhuppOl2xiIi8M tg1+04f6GGrFNOY2D2HsOebxfYJo7xWyNhTaiO55xoXRFdkeBwz0Y4ZtdK0Ob3NmuoPqT l1kMVGx09EAyaakc0jQHNqsc5UVSrVPeod/a1B1RROk9xIOJbxqlDaIL9i8CQEhcDyg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="Ikn5/aAX"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2EA05606A320; Wed, 18 Nov 2026 17:29:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Ikn5/aAX Received: by smtp.kernel.org (Postfix) with ESMTPSA id 851971F000C4; Wed, 18 Nov 2026 17:29:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795022967; bh=uPVdVsZhLsr4MqmqO4C5KFctNXGUWtPZZa65uwGzH6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ikn5/aAXZM4EXHBrcq/Gx6y/m64uDqDAQeAYFrvEZrNhL8oSNUIEi9a9jdSXia9Ga 67y0Ejzycn/vdqZbc/VE3atyRSHlvHRroNlSFDhwoD/Cm5ObhoQ7wZ+zcDMrm4cisU p5afzvzpps8pGFFVrKMF5IkO895qZZGAar4ATMz4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexander Aring , David Teigland , Sasha Levin Subject: [PATCH 6.18 0202/2151] dlm: fix variable key length lookup Date: Wed, 18 Nov 2026 15:32:17 +0100 Message-ID: <20261118150129.137469720@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Aring [ Upstream commit b4e6ae7ba711758c38d5eb7d5a7a0712273bdf6f ] Before commit 6c648035cbe7 ("dlm: switch to use rhashtable for rsbs") the rsb hashtable was dynamic key length. Accidentally it was changed to switch to static key length which can end in different results. We fixing this back to the original behaviour by adding the necessary functionality to rhashtable to handle the objects and lookups as dynamic key lengths. Fixes: 6c648035cbe7 ("dlm: switch to use rhashtable for rsbs") Signed-off-by: Alexander Aring Signed-off-by: David Teigland Signed-off-by: Sasha Levin --- fs/dlm/config.c | 30 ++++++++++++++++++++++++++++-- fs/dlm/dlm_internal.h | 5 +++++ fs/dlm/lock.c | 6 ++++-- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/fs/dlm/config.c b/fs/dlm/config.c index a0d75b5c83c63..0db5ce43425ca 100644 --- a/fs/dlm/config.c +++ b/fs/dlm/config.c @@ -64,11 +64,37 @@ static void release_node(struct config_item *); static struct configfs_attribute *comm_attrs[]; static struct configfs_attribute *node_attrs[]; +static u32 rsb_hashfn(const void *data, u32 len, u32 seed) +{ + const struct dlm_rsb_key *key = data; + + return jhash(key->name, key->len, 0); +} + +static u32 rsb_obj_hashfn(const void *data, u32 len, u32 seed) +{ + const struct dlm_rsb *r = data; + + return r->res_hash; +} + +static int rsb_obj_cmpfn(struct rhashtable_compare_arg *arg, const void *obj) +{ + const struct dlm_rsb_key *key = arg->key; + const struct dlm_rsb *r = obj; + + if (key->len != r->res_length) + return -1; + + return memcmp(&r->res_name, key->name, key->len); +} + const struct rhashtable_params dlm_rhash_rsb_params = { .nelem_hint = 3, /* start small */ - .key_len = DLM_RESNAME_MAXLEN, - .key_offset = offsetof(struct dlm_rsb, res_name), .head_offset = offsetof(struct dlm_rsb, res_node), + .hashfn = rsb_hashfn, + .obj_hashfn = rsb_obj_hashfn, + .obj_cmpfn = rsb_obj_cmpfn, .automatic_shrinking = true, }; diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index d534a4bc162bb..08b903fbce589 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h @@ -340,6 +340,11 @@ struct dlm_rsb { char res_name[DLM_RESNAME_MAXLEN+1]; }; +struct dlm_rsb_key { + char name[DLM_RESNAME_MAXLEN]; + size_t len; +}; + /* dlm_master_lookup() flags */ #define DLM_LU_RECOVER_DIR 1 diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index f7f250ffc8eed..1d26eb2c192e5 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -625,12 +625,14 @@ static int get_rsb_struct(struct dlm_ls *ls, const void *name, int len, int dlm_search_rsb_tree(struct rhashtable *rhash, const void *name, unsigned int len, struct dlm_rsb **r_ret) { - char key[DLM_RESNAME_MAXLEN] = {}; + struct dlm_rsb_key key = { + .len = len, + }; if (len > DLM_RESNAME_MAXLEN) return -EINVAL; - memcpy(key, name, len); + memcpy(key.name, name, len); *r_ret = rhashtable_lookup_fast(rhash, &key, dlm_rhash_rsb_params); if (*r_ret) return 0; -- 2.53.0