From patchwork Fri Sep 27 22:34:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1168749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lR4JSa5Z"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46g67J4PmMz9sN1 for ; Sat, 28 Sep 2019 08:35:08 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 6487311BA; Fri, 27 Sep 2019 22:34:29 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id E0A7011AE for ; Fri, 27 Sep 2019 22:34:26 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6B4988BD for ; Fri, 27 Sep 2019 22:34:26 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id a15so3646706edt.6 for ; Fri, 27 Sep 2019 15:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RwRFH1ZvWik7LVXG2Fywbhogpa/YEkVSa/+8ccGRlMA=; b=lR4JSa5Z9RRZXVMqCCOPCORDcP6Dp8SgfL3pit+R7BALod1PY1O84wXeZsk/2AQleR kolww8iSwAk/XcnET/ptcNXYcix65wHMzpYkojdk+G/pQxF+8JYLYp2mol8cwqWFx9tI i9ifrr5jsjP1dGh9bzQprhTTfxp9E7Pu+RNRQAbmVTJ+LFYUPA3O2drgNwYtKB2xgxMg z+qZw7EYmbyAi9leOO9XAdDgysc4WxvGbnt0kW6t3mo4MCpJQ3zvd9lHSMpvrRf563RK HJgbRx3kIE3smyxLjCtZ1534LNshSLbYhY/0dhJybIqyEBJLev7/nXN5SWwUhA9vx3Nz LTBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RwRFH1ZvWik7LVXG2Fywbhogpa/YEkVSa/+8ccGRlMA=; b=PvIkg8ele4dBHCGXlbDFAcuDAfnctWsnuA87GfxqMeUBR4HJQzgjF3TTYR0gWEfFum oLrUPBGxjI8M1f+9GSksK0LIPo9gfb8zycthf3n7ppq3OJmsQ1VvvcySD99Po7UdhP8N IP9H0Uj+tySiGhl64D3S7ouGkAYJ7UgEqqdMfAYDfdjJDkLMWTOEjLKbXz1VyT5WHrbK X6+WiPRCaziunnpKjiw5erSsLdvXI7XFHBU1luXoMeJVeV+icjsjklI+I4WPgbWPRlOn dYCVwEztKAfvI1McX7iqJ6EKznhq82rNs4nP1ik4JOPOqXQ+/g+kqQkWvVgH3L/DsswH ZyPA== X-Gm-Message-State: APjAAAUj8sceqrnVSCaG5G0ZZ6tJiye8PXmwcfu+VpvCWCdjWTfhLicF XTPfSCbwlsVTYQzhtMlENU0QirrT X-Google-Smtp-Source: APXvYqxWGdzo3Vxi/7doJ4jGRHcDgFw/yNCyQzmz0w2JyVgRtyF5Fq8FuBxwDABRNpr4XnbNNuzLQg== X-Received: by 2002:aa7:c614:: with SMTP id h20mr7026387edq.209.1569623664755; Fri, 27 Sep 2019 15:34:24 -0700 (PDT) Received: from localhost.localdomain.localdomain ([216.113.160.77]) by smtp.gmail.com with ESMTPSA id ng5sm715794ejb.9.2019.09.27.15.34.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Sep 2019 15:34:24 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Fri, 27 Sep 2019 15:34:16 -0700 Message-Id: <1569623665-77390-2-git-send-email-hzhou8@ebay.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1569623665-77390-1-git-send-email-hzhou8@ebay.com> References: <1569623665-77390-1-git-send-email-hzhou8@ebay.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [RFC PATCH ovn 01/10] ovn-northd.c: Fix datapath tunnel key allocation. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Han Zhou The max tunnel key for datapath is defined as (1u << 24) - 1, but we are using uint16_t variable to hold the value, which will result in duplicated key when there are enough number of datapath key allocation and deletions. Signed-off-by: Han Zhou --- northd/ovn-northd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 2df95c1..1bb60ce 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -1006,7 +1006,7 @@ build_datapaths(struct northd_context *ctx, struct hmap *datapaths, /* Add southbound record for each unmatched northbound record. */ LIST_FOR_EACH (od, list, &nb_only) { - uint16_t tunnel_key = ovn_datapath_allocate_key(&dp_tnlids); + uint32_t tunnel_key = ovn_datapath_allocate_key(&dp_tnlids); if (!tunnel_key) { break; }