Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1093712iob; Wed, 4 May 2022 14:34:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwId7/lrVh+TnxkFfPH26xVXtVD9IUqGWHdV+v62FIqMQBEhwjYE40fhnTk1X0bEiXEzJgM X-Received: by 2002:a63:1117:0:b0:399:2df0:7fb9 with SMTP id g23-20020a631117000000b003992df07fb9mr20225436pgl.40.1651700070197; Wed, 04 May 2022 14:34:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651700070; cv=none; d=google.com; s=arc-20160816; b=Fow0q8AZEyIw0wiZQvjtBK9q0yZ76TmXACTqznjXC0qzjGHFnFohpbJoLBp4jDIFsV 88jTYTIWtl98CJKNFLUM4NcUoKb3kbab0ykaahA5RMzQEKUOSVjsMnGryz3EYVXskUEI u8Nf+ijds4nN/jgp2qnZA9EiJUq08mpPzKUAvU20yqLXLRFOTR4R/2FHJdNk4nx/8T+x TYq1U3k2g5w5U1eus6Pj99NugIaavfLqj887JbaL5r9btexvxQGLgI3W/VIv1dZMv0R/ HAf+bK5KCsA9CFnOM5mKU4sN54CIwMW/0F2G0Qi1FxOBL/R2tvYMcSbHgOjE4BxR02Ou 2ZTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FYb2qdhVD6GQdLxdfZXbHSVnupAetfyf6MaKqUe4X0I=; b=pTStWj+cA+nZ45Biqkj2F0PtxYuPyKFltVBLWi4YFICi+B7obZMmGe+7ui36PmSr6r rEpZpYWdML2m/S0WrQb78Zkxqqxvl4maK8O6lKDYQqKF3ROsb8PR22J1UbrWiYTX7n+K /bUhC6IsjvgnPnxrHEmgDnH2s5h30BxIlBMtOLoX5PQ5gU23T4GozC8ePgh2K9OYzIPR JrzYu7XtVG6LWv/yiCn77y6Z8AFGUl37QikfjnBIrLJlMoZv4Oze8YvR1Of0Ris+Ex6J uMELK2qgqGSKfxATvTscj6q2zolrdNvWiZWl9kAo4oxlMhjymk1oZKEix8F3MR748p2W Psng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=heVUcRPv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f26-20020a63555a000000b0039cbfcd3b1dsi21068504pgm.830.2022.05.04.14.34.15; Wed, 04 May 2022 14:34:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=heVUcRPv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358705AbiEDRfG (ORCPT + 99 others); Wed, 4 May 2022 13:35:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357212AbiEDRKC (ORCPT ); Wed, 4 May 2022 13:10:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28247496A0; Wed, 4 May 2022 09:57:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 718AF618E5; Wed, 4 May 2022 16:57:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB672C385C5; Wed, 4 May 2022 16:57:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683428; bh=1PxZCugPr4DxiBBU19KWct2wANpsU0yR63LGAuaYykk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=heVUcRPv+0Au/05kyIv6zzUlqUdVmbZA4k6bPi1o/7gHobhEyye3Nj+AbEayfYz9w vJCYjW1cT9YkXgECklBINSt2qKdgYmg3a+vDgMC8YTo0LlYix9e28xkVZ/IA3vxBoJ b3VS2sAXZoLS2L6JfPlyxADI/cxR6UGDmnRWxJo4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pengcheng Yang , Julian Anastasov , Simon Horman , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.17 094/225] ipvs: correctly print the memory size of ip_vs_conn_tab Date: Wed, 4 May 2022 18:45:32 +0200 Message-Id: <20220504153119.205299054@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pengcheng Yang [ Upstream commit eba1a872cb73314280d5448d934935b23e30b7ca ] The memory size of ip_vs_conn_tab changed after we use hlist instead of list. Fixes: 731109e78415 ("ipvs: use hlist instead of list") Signed-off-by: Pengcheng Yang Acked-by: Julian Anastasov Acked-by: Simon Horman Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/ipvs/ip_vs_conn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 2c467c422dc6..fb67f1ca2495 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -1495,7 +1495,7 @@ int __init ip_vs_conn_init(void) pr_info("Connection hash table configured " "(size=%d, memory=%ldKbytes)\n", ip_vs_conn_tab_size, - (long)(ip_vs_conn_tab_size*sizeof(struct list_head))/1024); + (long)(ip_vs_conn_tab_size*sizeof(*ip_vs_conn_tab))/1024); IP_VS_DBG(0, "Each connection entry needs %zd bytes at least\n", sizeof(struct ip_vs_conn)); -- 2.35.1