From patchwork Mon Feb 12 20:17:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 872363 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ya84lMpm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zgH6X4zWWz9t32 for ; Tue, 13 Feb 2018 07:18:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753008AbeBLUSK (ORCPT ); Mon, 12 Feb 2018 15:18:10 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:41157 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752400AbeBLUSI (ORCPT ); Mon, 12 Feb 2018 15:18:08 -0500 Received: by mail-lf0-f66.google.com with SMTP id f136so22103834lff.8 for ; Mon, 12 Feb 2018 12:18:07 -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=+kEqbMF1D1r2iXOYUqMj8QvVMDCoMpjWOTxBTh2i14Y=; b=Ya84lMpmdzT7Hd8C56JVxGxMIvXl8LXzO56uhGbYMS5TnAuFZYrQCKn2G7go2Q5VfS 7h7csiiJdJ5tERyVrfU/MqZGqTi1DNjOSy7fH01cZZ2nSp5SF40J06f1mScffGgL/N3B CYQwBFjgn1Fjgu1kg/G8S7ZRPeZp4kUvVC0cfRQp3+/rh8gG8poCDkiuqIFz0vYslFS0 F/N9H8rfPhLBg2ZReE8We8rtZSmvfeO6620pC0Z1WwglylHQVrTgASBT9oWzJ7c1U74U XcIFa1y6iasMlIjRuIdNSrV5kxXm39jZPRHLQievCTzeXw+n3/BOBFXysZ0FkYp3vHRX WnTQ== 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=+kEqbMF1D1r2iXOYUqMj8QvVMDCoMpjWOTxBTh2i14Y=; b=I2cy6ow1TFasJ16bezhr4dCAOK8znuVtuYOw9oStTmXlpsqR+J/b30tdHtZKPmu4Xf Bj6cU4KOF71o8J6PU6YYBlKUY/FlzqvLVV+9BL8Hnwx/4ovlhz/Q7yqVRGT30UEIMir1 cIBiCSFM/8FJVdQOibUIEJNqCPGxqE6PlZMmpIHaEAcVpKfngNKPjroU4PP7GTRzY6Rd rgy/k2Lh6gGdDaVnHlxF/WG/73JmVeGLOs7QTJHM2jDwQhLAhqt/mMTOaOmr5dQw23N9 kEfrvaog7XM1+b9DvujVfnrojKmfWhrCuBr7nf0jn8Gsh1vTlcGJDojckY6vTy5R0nR7 BqOA== X-Gm-Message-State: APf1xPDUL8D0WDOjrHMd7K0rRRWXKgwx6UiXEhB57yIQCEjVxoJVYjMF CispejW4uZt6sCYB/j+ZTxlikw== X-Google-Smtp-Source: AH8x226Ac92rwWPI6zPaBEjP1u0x4zRPunGFlToYc3XYyBsle8DDjuAX3x3NDv7UoivbxjzfcxaENA== X-Received: by 10.25.17.73 with SMTP id g70mr7889180lfi.0.1518466686699; Mon, 12 Feb 2018 12:18:06 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id f199sm230269lfg.44.2018.02.12.12.18.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 12:18:05 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2-next v3 1/4] utils: Introduce and use inet_prefix_reset() Date: Mon, 12 Feb 2018 22:17:56 +0200 Message-Id: <1518466679-3605-2-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> References: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Initializing @inet_prefix using C initializers or memset() seems inefficient and unnecessary: only small part of ->data[] field will be used to store address corresponding to ->family. Instead initialize ->flags with zero and assume no other fields accessed before checking corresponding bits in ->flags. For example special helpers (e.g. is_addrtype_*()) can be used to ensure that @inet_prefix contains valid ip or ipv6 address. Signed-off-by: Serhey Popovych --- include/utils.h | 5 +++++ ip/iplink_geneve.c | 2 +- ip/iplink_vxlan.c | 7 ++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/utils.h b/include/utils.h index 4dc514d..867e540 100644 --- a/include/utils.h +++ b/include/utils.h @@ -65,6 +65,11 @@ enum { ADDRTYPE_INET_MULTI = ADDRTYPE_INET | ADDRTYPE_MULTI }; +static inline void inet_prefix_reset(inet_prefix *p) +{ + p->flags = 0; +} + static inline bool is_addrtype_inet(const inet_prefix *p) { return p->flags & ADDRTYPE_INET; diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c index c666072..1fcdd83 100644 --- a/ip/iplink_geneve.c +++ b/ip/iplink_geneve.c @@ -71,7 +71,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, bool set_op = (n->nlmsg_type == RTM_NEWLINK && !(n->nlmsg_flags & NLM_F_CREATE)); - daddr.flags = 0; + inet_prefix_reset(&daddr); while (argc > 0) { if (!matches(*argv, "id") || diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c index 00875ba..d768c07 100644 --- a/ip/iplink_vxlan.c +++ b/ip/iplink_vxlan.c @@ -74,8 +74,7 @@ static void check_duparg(__u64 *attrs, int type, const char *key, static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv, struct nlmsghdr *n) { - inet_prefix saddr; - inet_prefix daddr; + inet_prefix saddr, daddr; __u32 vni = 0; __u8 learning = 1; __u16 dstport = 0; @@ -85,7 +84,9 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv, !(n->nlmsg_flags & NLM_F_CREATE)); saddr.family = daddr.family = AF_UNSPEC; - saddr.flags = daddr.flags = 0; + + inet_prefix_reset(&saddr); + inet_prefix_reset(&daddr); while (argc > 0) { if (!matches(*argv, "id") ||