From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id MK7hDVCrQWM4KwAAbAwnHQ (envelope-from ) for ; Sat, 08 Oct 2022 18:54:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id YM4KDVCrQWMrQwAAG6o9tA (envelope-from ) for ; Sat, 08 Oct 2022 18:54:40 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E1F69267C for ; Sat, 8 Oct 2022 18:54:39 +0200 (CEST) Received: from localhost ([::1]:52660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohD5z-0006Lu-5L for larch@yhetil.org; Sat, 08 Oct 2022 12:54:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohD5Q-000616-EV for guix-patches@gnu.org; Sat, 08 Oct 2022 12:54:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohD5P-00075q-ES for guix-patches@gnu.org; Sat, 08 Oct 2022 12:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ohD5P-0002d4-8N for guix-patches@gnu.org; Sat, 08 Oct 2022 12:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58382] [PATCH 3/3] link: Add partial support for bond interfaces Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Oct 2022 16:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58382 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58382@debbugs.gnu.org Received: via spool by 58382-submit@debbugs.gnu.org id=B58382.166524801710049 (code B ref 58382); Sat, 08 Oct 2022 16:54:03 +0000 Received: (at 58382) by debbugs.gnu.org; 8 Oct 2022 16:53:37 +0000 Received: from localhost ([127.0.0.1]:41369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohD4y-0002bw-R4 for submit@debbugs.gnu.org; Sat, 08 Oct 2022 12:53:37 -0400 Received: from mail.mmer.org ([178.22.65.174]:45374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohD4w-0002bF-0F for 58382@debbugs.gnu.org; Sat, 08 Oct 2022 12:53:34 -0400 Received: from mail.mmer.org (localhost [127.0.0.1]) by mail.mmer.org (OpenSMTPD) with ESMTP id 8aea12e8 for <58382@debbugs.gnu.org>; Sat, 8 Oct 2022 16:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=mmer.org; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=X6Rube3fSc60OJbqK4+UG6cI2 mkmuo8bU9tsRtqppfQ=; b=MF0vmEHLB8cRRZsUhlKE6C6ianEnlSDfZhJ0lvFeA j4k7vgh1LJ5buDi0qfkZP8TB78Oc3pST5P5GFagaH6hU0BkArSeHo0mscvK4n4dD HaAZn8M3KXdd/nahfFRIykdv/7ZMBDofpKupMgK50w+fziZF9pr6nf4IbL5T9dcB 9M= Received: from delta (j74210.upc-j.chello.nl [24.132.74.210]) by mail.mmer.org (OpenSMTPD) with ESMTPSA id f2037dae (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <58382@debbugs.gnu.org>; Sat, 8 Oct 2022 16:53:26 +0000 (UTC) Date: Sat, 8 Oct 2022 18:53:14 +0200 Message-Id: <20221008165314.14056-3-levenson@mmer.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221008165314.14056-1-levenson@mmer.org> References: <20221008165314.14056-1-levenson@mmer.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Alexey Abramov X-ACL-Warn: , Alexey Abramov via Guix-patches From: Alexey Abramov via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665248080; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=lGMagASLDyrckCJjIQfvsZxN7R1srh8KPwU+9l+xQjw=; b=DG2ViCN1KSuc01StwJpmyhW46Q7pUncvtzp3nrEVQmEwE+UXa7LBWDEMbSsXEQAEkjOTY1 SQ3Cwyanb9+weKb18MNvUmaSsckY2X+wjBNLRghwtevulj+u6dbxRzRtNw1CPqBblbf+Ez QBPabFLAXP9QFCR+2M8tzBtjzeHPH5OwZkoKaI4vvLTxTCBqqMkkgZgf03GZWOkLh5qLRd rk40EmcrshGCwJcByYAM606gQo2f6A5PZlXCAYGgIDwQgRwI32bTkZVMRvknniCoGwINj3 KCReGjNFjwqNUWidovGB5WU8Ip7cgPkAMU88Y4xedVf1bEBAGCtQJG/69Li6LA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665248080; a=rsa-sha256; cv=none; b=aodiKoIqQTXvQRGZEZDeVgwTmNDuZMLNMnowfOAY57FMbB6TIKs1IcWX8m85NYK9jWrOqo HZjzZBapM93JeIzGYvosR9ep8xiWlM9sBnloaE99GYmvANwwf+iBigRH2OsYUD1d3wTkbL cJ6nZF9mDz1i1g5JZ62IzKYR5VPqZirebhmnrk5eFoE1keTwuUiPYaJurxEzI8Gmkh5p02 FzPF3lLuiZVWSjeL3fU/TGfbJYT0Ci8ssrt4b/w8TZd22nCiPcDeBGTb4R/AGYQHXOnQ/7 mQFoIJjXowGaxW4sKe6jkSX9CBGwtBCYxO78t3zlj7cs88GsKKJpwGuHZIUDhA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mmer.org header.s=dkim header.b=MF0vmEHL; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.38 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mmer.org header.s=dkim header.b=MF0vmEHL; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E1F69267C X-Spam-Score: -1.38 X-Migadu-Scanner: scn1.migadu.com X-TUID: dbwlEtDCVZ2n * ip/link.scm (link-add): Support specific arguments for `bond' type link. (bond-type-args): New function. Implement mode, miimon and lacp-rate configuration for bonds. (alist->keyword+value): New function. * netlink/constant.scm: Define bond specific information. Define constants for bond modes. --- ip/link.scm | 65 ++++++++++++++++++++++++++++++++++++++++++++ netlink/constant.scm | 30 ++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/ip/link.scm b/ip/link.scm index 70ab79f..f6144c0 100644 --- a/ip/link.scm +++ b/ip/link.scm @@ -249,6 +249,70 @@ criteria." (close-socket sock) (answer-ok? (last answer))))) +(define* (bond-type-args #:key (mode #f) (miimon #f) (lacp-active #f) (lacp-rate #f) + (primary #f) (primary-reselect #f)) + `(,@(if mode + (list + (make-route-attr IFLA_BOND_MODE + (match mode + ("balance-rr" (make-u8-route-attr BOND_MODE_ROUNDROBIN)) + ("active-backup" (make-u8-route-attr BOND_MODE_ACTIVEBACKUP)) + ("balance-xor" (make-u8-route-attr BOND_MODE_XOR)) + ("broadcast" (make-u8-route-attr BOND_MODE_BROADCAST)) + ("802.3ad" (make-u8-route-attr BOND_MODE_8023AD)) + ("balance-tlb" (make-u8-route-attr BOND_MODE_TLB)) + ("balance-alb" (make-u8-route-attr BOND_MODE_ALB)) + (_ (raise (condition + (&message + (message "Bond field `mode' can be defined as balance-rr|active-backup|balance-xor|broadcast|802.3ad|balance-tlb|balance-alb" )))))))) + '()) + ,@(if miimon + (list + (make-route-attr IFLA_BOND_MIIMON + (make-u32-route-attr miimon))) + '()) + ,@(if primary + (list + (make-route-attr IFLA_BOND_PRIMARY + (make-u32-route-attr (link-name->index primary)))) + '()) + ,@(if primary-reselect + (list + (make-route-attr IFLA_BOND_PRIMARY_RESELECT + (match primary-reselect + ("always" (make-u8-route-attr BOND_PRIMARY_RESELECT_ALWAYS)) + ("better" (make-u8-route-attr BOND_PRIMARY_RESELECT_BETTER)) + ("failure" (make-u8-route-attr BOND_PRIMARY_RESELECT_FAILURE)) + (_ (raise (condition + (&message + (message "Bond field `primary-reselect' can be defined as always|better|failure" )))))))) + '()) + ,@(if lacp-active + (list + (make-route-attr IFLA_BOND_AD_LACP_ACTIVE + (match lacp-active + ("on" (make-u8-route-attr BOND_AD_LACP_ACTIVE_ON)) + ("off" (make-u8-route-attr BOND_AD_LACP_ACTIVE_OFF)) + (_ (raise (condition + (&message + (message "Bond field `lacp-active' can be defined as off|on" )))))))) + '()) + ,@(if lacp-rate + (list + (make-route-attr IFLA_BOND_AD_LACP_RATE + (match lacp-rate + ("slow" (make-u8-route-attr 0)) + ("fast" (make-u8-route-attr 1)) + (_ (raise (condition + (&message + (message "Bond field `lacp-rate' can be defined as slow|fast")))))))) + '()))) + +(define (alist->keyword+value alist) + (fold (match-lambda* + (((k . v) r) + (cons* (symbol->keyword k) v r))) '() alist)) + (define* (link-add name type #:key (type-args '())) (define request-num (random 65535)) (define type-data @@ -268,6 +332,7 @@ criteria." (make-string-route-attr (assoc-ref type-args 'peer))))))) '()))) + ("bond" (apply bond-type-args (alist->keyword+value type-args))) ;; TODO: unsupported for now (_ '()))) (define message diff --git a/netlink/constant.scm b/netlink/constant.scm index ce5e15e..7c72fc1 100644 --- a/netlink/constant.scm +++ b/netlink/constant.scm @@ -82,6 +82,36 @@ IFLA_VLAN_UNSPEC IFLA_VLAN_ID IFLA_VLAN_FLAGS IFLA_VLAN_EGRESS_QOS IFLA_VLAN_INGRESS_QOS IFLA_VLAN_PROTOCOL) +(define-enum int->bond-linkinfo + IFLA_BOND_UNSPEC IFLA_BOND_MODE IFLA_BOND_ACTIVE_SLAVE IFLA_BOND_MIIMON + IFLA_BOND_UPDELAY IFLA_BOND_DOWNDELAY IFLA_BOND_USE_CARRIER IFLA_BOND_ARP_INTERVAL + IFLA_BOND_ARP_IP_TARGET IFLA_BOND_ARP_VALIDATE IFLA_BOND_ARP_ALL_TARGETS + IFLA_BOND_PRIMARY IFLA_BOND_PRIMARY_RESELECT IFLA_BOND_FAIL_OVER_MAC IFLA_BOND_XMIT_HASH_POLICY + IFLA_BOND_RESEND_IGMP IFLA_BOND_NUM_PEER_NOTIF IFLA_BOND_ALL_SLAVES_ACTIVE + IFLA_BOND_MIN_LINKS IFLA_BOND_LP_INTERVAL IFLA_BOND_PACKETS_PER_SLAVE + IFLA_BOND_AD_LACP_RATE IFLA_BOND_AD_SELECT IFLA_BOND_AD_INFO IFLA_BOND_AD_ACTOR_SYS_PRIO + IFLA_BOND_AD_USER_PORT_KEY IFLA_BOND_AD_ACTOR_SYSTEM IFLA_BOND_TLB_DYNAMIC_LB + IFLA_BOND_PEER_NOTIF_DELAY IFLA_BOND_AD_LACP_ACTIVE IFLA_BOND_MISSED_MAX IFLA_BOND_NS_IP6_TARGET) + +;; see iproute2/ip/iplink_bond.c for mode_tbl +(define-public BOND_MODE_ROUNDROBIN 0) +(define-public BOND_MODE_ACTIVEBACKUP 1) +(define-public BOND_MODE_XOR 2) +(define-public BOND_MODE_BROADCAST 3) +(define-public BOND_MODE_8023AD 4) +(define-public BOND_MODE_TLB 5) +;; TLB + RLB (receive load balancing) +(define-public BOND_MODE_ALB 6) + +;; see iproute2/ip/iplink_bond.c primary_reselect_tbl +(define-public BOND_PRIMARY_RESELECT_ALWAYS 0) +(define-public BOND_PRIMARY_RESELECT_BETTER 1) +(define-public BOND_PRIMARY_RESELECT_FAILURE 2) + +;; see iproute2/ip/iplink_bond.c for lacp_active_tbl +(define-public BOND_AD_LACP_ACTIVE_OFF 0) +(define-public BOND_AD_LACP_ACTIVE_ON 1) + (define-enum int->addr-attr-kind IFA_UNSPEC IFA_ADDRESS IFA_LOCAL IFA_LABEL IFA_BROADCAST IFA_ANYCAST IFA_CACHEINFO IFA_MULTICAST IFA_FLAGS -- 2.36.1