From patchwork Wed Feb 20 16:17:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 1045445 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="my9ZcjN7"; 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 444NBT1780z9s5c for ; Thu, 21 Feb 2019 03:20:49 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4EB752C6D; Wed, 20 Feb 2019 16:20:09 +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 828272BF3 for ; Wed, 20 Feb 2019 16:17:29 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 47A9C7E9 for ; Wed, 20 Feb 2019 16:17:29 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id d25so3784301pfn.8 for ; Wed, 20 Feb 2019 08:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=aHZ5wBhOWfXKUTBW56CgA89Wc/HRzemjz8ZCbHJ9jTg=; b=my9ZcjN7U9Q2SvpoHV+uGA/onUJWTSUomv/3GQ12cFvqVI9wEQPXRW3tDw0YVZdgNo qrS+Z/OLmgPRRdG611wWp4r8rcGgjRaH8PbRDT8L72bxCEVyEVmmb9Yafo0m0pfIIfu8 kE5sBlmLB+wAZQC2Eaa7aLzcljYLROktGcwZSaLoamtKaAks0ysphBp45qz1o7mu82qB rf+u8am1Vhk4lIYrJPOEaHt06b5AsXHzSqcMVreKoPRI5TIRTn0an8ZndmShTeMyV9Pa J0cclnOkjK0OjQrPZFVyTGSsEYAGuuDwodLGWrtkR95a7J9YgfIfAg8hvlXFKLzeQTXk rwsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=aHZ5wBhOWfXKUTBW56CgA89Wc/HRzemjz8ZCbHJ9jTg=; b=lI3L6kviQZtC5V2+yyRUneGwHbnO+XzyfGG/mMJKi9lODk2IS5W7OvGi1smQJMneVe ljNxZiFQ4zcbRBvOgvpvchXRqhRpFwMVWYHCFwVvNtw5JXTz1xEC/aIb9WjdTFt/XAsf hKNuAS1eN/to1Hsb5tNBdVZL+nQARa7fVRIgLIhSKJDKLZnZOzf5yEeuowU0ahCAOouB LEhdNr+lW6QS5r5COO1d6db0mL79VC4amogCPDzF4CwBIe66Zjhlj5E9RmFVWNihzTqH UdwESYvwRUhk/E6USRv9k4Q+U2aA8lqJg7WfbMDY61mvJ6S3jFyNp+jBl18jpCIFcOqT GxfQ== X-Gm-Message-State: AHQUAuaUn1PySP5WNCa7bcgnMoiTykZQEkUHYGrxpLu+akl4+UwRylZw vnJLdZysWyFrO9AMZlrdSj6V4neJ X-Google-Smtp-Source: AHgI3IYXsyshuBPETys4QDrdvekhi6SlBLH1PEekBet7DiAv1gpD12wm2sUSWZZoCqzGrYorT6+5SA== X-Received: by 2002:a63:2147:: with SMTP id s7mr23287421pgm.361.1550679448868; Wed, 20 Feb 2019 08:17:28 -0800 (PST) Received: from ubuntu.localdomain (c-76-102-76-212.hsd1.ca.comcast.net. [76.102.76.212]) by smtp.gmail.com with ESMTPSA id q207sm212713pgq.88.2019.02.20.08.17.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Feb 2019 08:17:28 -0800 (PST) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org Date: Wed, 20 Feb 2019 08:17:15 -0800 Message-Id: <1550679439-95810-2-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1550679439-95810-1-git-send-email-dlu998@gmail.com> References: <1550679439-95810-1-git-send-email-dlu998@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [patch v3 2/6] ipf: Do not preallocate more than needed. 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 ipf_reassemble_v4_frags() and ipf_reassemble_v6_frags() are preallocating more than needed for the reassembled packet. Signed-off-by: Darrell Ball --- v3: Add minor optimization. lib/ipf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/ipf.c b/lib/ipf.c index 125a815..a4608af 100644 --- a/lib/ipf.c +++ b/lib/ipf.c @@ -420,15 +420,16 @@ ipf_reassemble_v4_frags(struct ipf_list *ipf_list) return NULL; } - dp_packet_prealloc_tailroom(pkt, len + rest_len); + dp_packet_prealloc_tailroom(pkt, rest_len); for (int i = 1; i <= ipf_list->last_inuse_idx; i++) { size_t add_len = frag_list[i].end_data_byte - frag_list[i].start_data_byte + 1; - len += add_len; const char *l4 = dp_packet_l4(frag_list[i].pkt); dp_packet_put(pkt, l4, add_len); } + + len += rest_len; l3 = dp_packet_l3(pkt); ovs_be16 new_ip_frag_off = l3->ip_frag_off & ~htons(IP_MORE_FRAGMENTS); l3->ip_csum = recalc_csum16(l3->ip_csum, l3->ip_frag_off, @@ -463,16 +464,16 @@ ipf_reassemble_v6_frags(struct ipf_list *ipf_list) return NULL; } - dp_packet_prealloc_tailroom(pkt, pl + rest_len); + dp_packet_prealloc_tailroom(pkt, rest_len); for (int i = 1; i <= ipf_list->last_inuse_idx; i++) { size_t add_len = frag_list[i].end_data_byte - frag_list[i].start_data_byte + 1; - pl += add_len; const char *l4 = dp_packet_l4(frag_list[i].pkt); dp_packet_put(pkt, l4, add_len); } + pl += rest_len; l3 = dp_packet_l3(pkt); uint8_t nw_proto = l3->ip6_nxt;