From patchwork Wed Nov 22 20:05:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 840505 X-Patchwork-Delegate: shemminger@vyatta.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=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="qvp+gKSb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yhtkr4zRHz9s71 for ; Thu, 23 Nov 2017 07:06:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751583AbdKVUGY (ORCPT ); Wed, 22 Nov 2017 15:06:24 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:42928 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751549AbdKVUGV (ORCPT ); Wed, 22 Nov 2017 15:06:21 -0500 Received: by mail-pf0-f195.google.com with SMTP id m88so12519229pfi.9 for ; Wed, 22 Nov 2017 12:06:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZFmYvbdPclguRjQNQeVW4x+ycS/vE0V6Qoxk1KDARzs=; b=qvp+gKSbgBZxTwDJjPOiW+oaT02ExFznaDv8jAWZDPd+PE1xqd5KxvkguhdnIPQMbk IIT6FXON8coptMiiGtnhDCAbEm9b2J2rXMU0kf7bLmi9jzhDMRKzSFhtC2Z58XemYNKE VxShTAU8UZ/V+4Ypjz8YmzSdQt+eibUtHi3/tfzVR+uJiB0o9dy79jgw9Drj3QC+5msV pO+Wde4cMVaRjfa2m/H2le6Y7JkEQajDWgne6pT80nBrzx/1bH4pSvTxCQKxwCJR0skq uDHsVpW3FyOEw4WqOF41o133OXuj/Dn3PCyPIlBhRHcmkErEMZ6FEo91UO4Vpr2CQZoD j6mA== 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=ZFmYvbdPclguRjQNQeVW4x+ycS/vE0V6Qoxk1KDARzs=; b=U232MExhObzU8g5PbJ9N/k/+QaLqxy/Eq7CXhDmcW9jeiQykMVhlz+VcPtcM31ec8d MaN8Ee9vUZuiGYGfnGj0KQJDGo6afrr/3n5ZVuSpVQOu0ZUfkWHKuigcdECWSYqpMnZE FJ5sv06zNMFGQkR/1RpxIWznZgnotkw/AVBolMZeGH2GzoMeuKpIPl2wna101p8e3j6A nidSUG0f6U8pzFKkCbCW7qdqsp5ekXR3wkk1eLgcPhuPG81eSYzu9OapPb5L3vpoyfw1 JJZPIcag+JY92XN/tVFTNVVDURLS4ZUAd4hSn4Oo762S/svSRo+AEiRqkPfgCtFU+8/T 7ksw== X-Gm-Message-State: AJaThX6uVUO9y/7QoyJbGYIvLcR+CIYStPJgS4Dy1ocrPOTvQsvBjYr+ /GQqrBR1uvY/dOvrCX171myHzg== X-Google-Smtp-Source: AGs4zMZAsBBd2tSyVcudn63V0gr+khgQ84o7sm5UZPVYblTH8oIBMlTkqedSsQ2XdlHifRVV7s4fsQ== X-Received: by 10.99.172.88 with SMTP id z24mr22203135pgn.46.1511381181315; Wed, 22 Nov 2017 12:06:21 -0800 (PST) Received: from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net. [73.162.13.107]) by smtp.gmail.com with ESMTPSA id e8sm30511348pfk.6.2017.11.22.12.06.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Nov 2017 12:06:20 -0800 (PST) From: Tom Herbert To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, rohit@quantonium.net, Tom Herbert Subject: [PATCH iproute 2/5] ila: added csum neutral support to ipila Date: Wed, 22 Nov 2017 12:05:34 -0800 Message-Id: <20171122200537.26703-3-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171122200537.26703-1-tom@quantonium.net> References: <20171122200537.26703-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add checksum neutral to ip ila configuration. This control whether the C-bit is interpreted as checksum neutral bit. Signed-off-by: Tom Herbert --- ip/ipila.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/ip/ipila.c b/ip/ipila.c index fe5c4d8b..d4935d18 100644 --- a/ip/ipila.c +++ b/ip/ipila.c @@ -26,7 +26,9 @@ static void usage(void) { fprintf(stderr, "Usage: ip ila add loc_match LOCATOR_MATCH " - "loc LOCATOR [ dev DEV ]\n"); + "loc LOCATOR [ dev DEV ] " + "[ csum-mode { adj-transport | neutral-map | " + "no-action } ]\n"); fprintf(stderr, " ip ila del loc_match LOCATOR_MATCH " "[ loc LOCATOR ] [ dev DEV ]\n"); fprintf(stderr, " ip ila list\n"); @@ -48,6 +50,32 @@ static int genl_family = -1; #define ADDR_BUF_SIZE sizeof("xxxx:xxxx:xxxx:xxxx") +static char *ila_csum_mode2name(__u8 csum_mode) +{ + switch (csum_mode) { + case ILA_CSUM_ADJUST_TRANSPORT: + return "adj-transport"; + case ILA_CSUM_NEUTRAL_MAP: + return "neutral-map"; + case ILA_CSUM_NO_ACTION: + return "no-action"; + default: + return "unknown"; + } +} + +static int ila_csum_name2mode(char *name) +{ + if (strcmp(name, "adj-transport") == 0) + return ILA_CSUM_ADJUST_TRANSPORT; + else if (strcmp(name, "neutral-map") == 0) + return ILA_CSUM_NEUTRAL_MAP; + else if (strcmp(name, "no-action") == 0) + return ILA_CSUM_NO_ACTION; + else + return -1; +} + static int print_addr64(__u64 addr, char *buff, size_t len) { __u16 *words = (__u16 *)&addr; @@ -113,9 +141,19 @@ static int print_ila_mapping(const struct sockaddr_nl *who, print_ila_locid(fp, ILA_ATTR_LOCATOR, tb, ADDR_BUF_SIZE); if (tb[ILA_ATTR_IFINDEX]) - fprintf(fp, "%s", ll_index_to_name(rta_getattr_u32(tb[ILA_ATTR_IFINDEX]))); + fprintf(fp, "%-16s", + ll_index_to_name(rta_getattr_u32( + tb[ILA_ATTR_IFINDEX]))); + else + fprintf(fp, "%-16s", "-"); + + if (tb[ILA_ATTR_CSUM_MODE]) + fprintf(fp, "%s", + ila_csum_mode2name(rta_getattr_u8( + tb[ILA_ATTR_CSUM_MODE]))); else fprintf(fp, "-"); + fprintf(fp, "\n"); return 0; @@ -152,9 +190,11 @@ static int ila_parse_opt(int argc, char **argv, struct nlmsghdr *n, __u64 locator = 0; __u64 locator_match = 0; int ifindex = 0; + int csum_mode = 0; bool loc_set = false; bool loc_match_set = false; bool ifindex_set = false; + bool csum_mode_set = false; while (argc > 0) { if (!matches(*argv, "loc")) { @@ -174,6 +214,16 @@ static int ila_parse_opt(int argc, char **argv, struct nlmsghdr *n, return -1; } loc_match_set = true; + } else if (!matches(*argv, "csum-mode")) { + NEXT_ARG(); + + csum_mode = ila_csum_name2mode(*argv); + if (csum_mode < 0) { + fprintf(stderr, "Bad csum-mode: %s\n", + *argv); + return -1; + } + csum_mode_set = true; } else if (!matches(*argv, "dev")) { NEXT_ARG(); @@ -211,6 +261,9 @@ static int ila_parse_opt(int argc, char **argv, struct nlmsghdr *n, if (ifindex_set) addattr32(n, 1024, ILA_ATTR_IFINDEX, ifindex); + if (csum_mode_set) + addattr8(n, 1024, ILA_ATTR_CSUM_MODE, csum_mode); + return 0; }