From patchwork Tue Jun 12 18:48:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Subash Abhinov Kasiviswanathan X-Patchwork-Id: 928457 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="BSVsGCF3"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="BSVsGCF3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 414zRq07zMz9s01 for ; Wed, 13 Jun 2018 04:48:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754087AbeFLSsf (ORCPT ); Tue, 12 Jun 2018 14:48:35 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:50898 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753979AbeFLSse (ORCPT ); Tue, 12 Jun 2018 14:48:34 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D98EF608B8; Tue, 12 Jun 2018 18:48:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1528829313; bh=35MMR5b1vUrO2nEZkwQy5qZ5pkS+W1wOY0X6QjMugu8=; h=From:To:Cc:Subject:Date:From; b=BSVsGCF38cm21rES6gZCAoBGF/xP81Fv2LX0E1qcSAAprw2e3/5AhhdUmwrYKvTL/ nQtjbJpPGjX1G3fRYlCTF4z+PLE9yM40oXMo5idnwCuC6mg652EG7eOsNrs1EcOcwG 5w+IqBFaxXDDmryDiSMQ7dWDX8Ne9wK1aqXyyCqM= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from subashab-lnx.qualcomm.com (unknown [129.46.15.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: subashab@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8D348607BB; Tue, 12 Jun 2018 18:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1528829313; bh=35MMR5b1vUrO2nEZkwQy5qZ5pkS+W1wOY0X6QjMugu8=; h=From:To:Cc:Subject:Date:From; b=BSVsGCF38cm21rES6gZCAoBGF/xP81Fv2LX0E1qcSAAprw2e3/5AhhdUmwrYKvTL/ nQtjbJpPGjX1G3fRYlCTF4z+PLE9yM40oXMo5idnwCuC6mg652EG7eOsNrs1EcOcwG 5w+IqBFaxXDDmryDiSMQ7dWDX8Ne9wK1aqXyyCqM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8D348607BB Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=subashab@codeaurora.org From: Subash Abhinov Kasiviswanathan To: lorenzo@google.com, netdev@vger.kernel.org, stephen@networkplumber.org, dsahern@gmail.com, steffen.klassert@secunet.com Cc: Subash Abhinov Kasiviswanathan Subject: [PATCH iproute2-next v2] ip-xfrm: Add support for OUTPUT_MARK Date: Tue, 12 Jun 2018 12:48:13 -0600 Message-Id: <1528829293-23222-1-git-send-email-subashab@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds support for OUTPUT_MARK in xfrm state to exercise the functionality added by kernel commit 077fbac405bf ("net: xfrm: support setting an output mark."). Sample output with output-mark - src 192.168.1.1 dst 192.168.1.2 proto esp spi 0x00004321 reqid 0 mode tunnel replay-window 0 flag af-unspec mark 0x10000/0x3ffff output-mark 0x20000 auth-trunc xcbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b211 96 enc cbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b233 anti-replay context: seq 0x0, oseq 0x0, bitmap 0x00000000 v1->v2: Moved the XFRMA_OUTPUT_MARK print after XFRMA_MARK in xfrm_xfrma_print() as mentioned by Lorenzo Signed-off-by: Subash Abhinov Kasiviswanathan Acked-by: Lorenzo Colitti --- ip/ipxfrm.c | 6 ++++++ ip/xfrm_state.c | 9 +++++++++ man/man8/ip-xfrm.8 | 2 ++ 3 files changed, 17 insertions(+) diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c index 12c2f72..8b88c8f 100644 --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c @@ -681,6 +681,12 @@ void xfrm_xfrma_print(struct rtattr *tb[], __u16 family, fprintf(fp, "%s", _SL_); } + if (tb[XFRMA_OUTPUT_MARK]) { + __u32 output_mark = rta_getattr_u32(tb[XFRMA_OUTPUT_MARK]); + + fprintf(fp, "\toutput-mark 0x%x %s", output_mark, _SL_); + } + if (tb[XFRMA_ALG_AUTH] && !tb[XFRMA_ALG_AUTH_TRUNC]) { struct rtattr *rta = tb[XFRMA_ALG_AUTH]; diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c index 85d959c..d005802 100644 --- a/ip/xfrm_state.c +++ b/ip/xfrm_state.c @@ -61,6 +61,7 @@ static void usage(void) fprintf(stderr, " [ flag FLAG-LIST ] [ sel SELECTOR ] [ LIMIT-LIST ] [ encap ENCAP ]\n"); fprintf(stderr, " [ coa ADDR[/PLEN] ] [ ctx CTX ] [ extra-flag EXTRA-FLAG-LIST ]\n"); fprintf(stderr, " [ offload [dev DEV] dir DIR ]\n"); + fprintf(stderr, " [ output-mark OUTPUT-MARK]\n"); fprintf(stderr, "Usage: ip xfrm state allocspi ID [ mode MODE ] [ mark MARK [ mask MASK ] ]\n"); fprintf(stderr, " [ reqid REQID ] [ seq SEQ ] [ min SPI max SPI ]\n"); fprintf(stderr, "Usage: ip xfrm state { delete | get } ID [ mark MARK [ mask MASK ] ]\n"); @@ -322,6 +323,7 @@ static int xfrm_state_modify(int cmd, unsigned int flags, int argc, char **argv) struct xfrm_user_sec_ctx sctx; char str[CTX_BUF_SIZE]; } ctx = {}; + __u32 output_mark = 0; while (argc > 0) { if (strcmp(*argv, "mode") == 0) { @@ -437,6 +439,10 @@ static int xfrm_state_modify(int cmd, unsigned int flags, int argc, char **argv) invarg("value after \"offload dir\" is invalid", *argv); is_offload = false; } + } else if (strcmp(*argv, "output-mark") == 0) { + NEXT_ARG(); + if (get_u32(&output_mark, *argv, 0)) + invarg("value after \"output-mark\" is invalid", *argv); } else { /* try to assume ALGO */ int type = xfrm_algotype_getbyname(*argv); @@ -720,6 +726,9 @@ static int xfrm_state_modify(int cmd, unsigned int flags, int argc, char **argv) } } + if (output_mark != 0) + addattr32(&req.n, sizeof(req.buf), XFRMA_OUTPUT_MARK, output_mark); + if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0) exit(1); diff --git a/man/man8/ip-xfrm.8 b/man/man8/ip-xfrm.8 index 988cc6a..e001596 100644 --- a/man/man8/ip-xfrm.8 +++ b/man/man8/ip-xfrm.8 @@ -59,6 +59,8 @@ ip-xfrm \- transform configuration .IR CTX " ]" .RB "[ " extra-flag .IR EXTRA-FLAG-LIST " ]" +.RB "[ " output-mark +.IR OUTPUT-MARK " ]" .ti -8 .B "ip xfrm state allocspi"