Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp577799imd; Sat, 3 Nov 2018 06:17:02 -0700 (PDT) X-Google-Smtp-Source: AJdET5egg1aTRyFtqM4QCWPcsRxe1ZrrKJrMe09EJshXe1YjQgnC81akNJplO+cklTL5u8HkWoiK X-Received: by 2002:a65:4646:: with SMTP id k6mr14007656pgr.153.1541251022917; Sat, 03 Nov 2018 06:17:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541251022; cv=none; d=google.com; s=arc-20160816; b=QMctyUfZor01Tqz5g4PDkxuBHwUcFmaKPTZPAfy7zQzt8dJwela1eDoCoG1bsJIp0Y 8LQKON5poR1NC9uPFYH4+Y0avZ1dU0EjS+QUNM23jJxG9vKzMVg6xskTmDM807vHfyms wNQ50LjLNcIcvfHMqaTqvBjY5p+b1LHTsmQfgO8SKEIvNs0I+lacegs8jfziZg4dVZgP 1VmuFUv8JAwW0T5OJ2f7aNuX53JVe7aWClJrLutZ3MAhtgfOPaQeOO5ZOhJ1k3oDxnvN +WF2SDRN5Y4jep8IEw1w5xiRI82Ggn5koUHfJN8UW+sng761Jk5OTp1C4o4gtOKSu03y fnlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=hbj/uKkGLZsD9Azw/DxgnwqX6C2uLPW5tE7wSndDMoY=; b=EJRad0YI8cOSbgVz6QZM4xNzSxRM0qRxySkXzhyuFjfSAvnX2JPdrnBxSCB55ZOWCR r7OZd0KdH0d6mQ0l1rVvD+2d7yUEtoQPRUpe7J08sr7sVAQx2O9usBCN5/kTfwIZjvv0 d4c1M8SYdAP6GtS6sv6qvyDN6xbczQM6hEsaHQQzWBT6XxYZoGniXCKbWQRmNiy/r2Mv YRIzXl3/NecrJLn56ZjXkpLqObDyElKgmjReT6yLl0UJc4w1lwpl28611EcQY3JhchoN FhNsx14S8LGrrUJtfIRMk0DURkhgNpcjhAZ97SOs4qkmVwKud4k490bffM1hNe7kcdPi gSzQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g74-v6si38955631pfe.4.2018.11.03.06.16.48; Sat, 03 Nov 2018 06:17:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728715AbeKCW1o (ORCPT + 99 others); Sat, 3 Nov 2018 18:27:44 -0400 Received: from mail.us.es ([193.147.175.20]:50480 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728025AbeKCW1o (ORCPT ); Sat, 3 Nov 2018 18:27:44 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id E4532A7F36 for ; Sat, 3 Nov 2018 14:16:22 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id D499ADA7A2 for ; Sat, 3 Nov 2018 14:16:22 +0100 (CET) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id C988FDA79C; Sat, 3 Nov 2018 14:16:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 00939DA73F; Sat, 3 Nov 2018 14:16:21 +0100 (CET) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Sat, 03 Nov 2018 14:16:20 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from us.es (sys.soleta.eu [212.170.55.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: 1984lsi) by entrada.int (Postfix) with ESMTPSA id C2CE84265A30; Sat, 3 Nov 2018 14:16:20 +0100 (CET) Date: Sat, 3 Nov 2018 14:16:20 +0100 X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: Vasily Khoruzhick Cc: Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Safonov , stable@vger.kernel.org Subject: Re: [PATCH v2] netfilter: conntrack: fix calculation of next bucket number in early_drop Message-ID: <20181103131620.alepdriguhu2rxc3@salvia> References: <20181025191543.15061-1-vasilykh@arista.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181025191543.15061-1-vasilykh@arista.com> User-Agent: NeoMutt/20170113 (1.7.2) X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 25, 2018 at 12:15:43PM -0700, Vasily Khoruzhick wrote: > If there's no entry to drop in bucket that corresponds to the hash, > early_drop() should look for it in other buckets. But since it increments > hash instead of bucket number, it actually looks in the same bucket 8 > times: hsize is 16k by default (14 bits) and hash is 32-bit value, so > reciprocal_scale(hash, hsize) returns the same value for hash..hash+7 in > most cases. > > Fix it by increasing bucket number instead of hash and rename _hash > to bucket to avoid future confusion. Applied, thanks.