From patchwork Tue Mar 21 11:51:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13182659 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68ADEC74A5B for ; Tue, 21 Mar 2023 11:53:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230499AbjCULxT (ORCPT ); Tue, 21 Mar 2023 07:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230387AbjCULxN (ORCPT ); Tue, 21 Mar 2023 07:53:13 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2046.outbound.protection.outlook.com [40.107.243.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC1812D59 for ; Tue, 21 Mar 2023 04:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZmCHwUZHNrxqf+v5mYG+8KNEyfsVnOSrfk7eGsgRT7AD4hKAxHP7SLMyHzi1zGaa0OjMqB2CIe7O8IwA6tBBNWLh/CpdR+gYoOUaQLKJn9KS9nHkYKYxrVdpbSh++wd19BLbNAiGW+jAsif5ceB0jJ5w8MUOprgPbSFHN0MTb9ZOhjNTS/KI4L2qC0vK26FFisGzKb269KOQSFti7EfDNWKGPPYuNltOWlcSu1gech5I7yFF5DSwJvBX43F3h/6EgcGVGancKBiv+7rA0rt7XDBDjErr47yz8mX9wpdicqdzHf4YRC9NhKAQiO3srqWc+fd+lpjgEjc1zkJiYjNUfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Pf8MmxHcMECnOxWRPIIkJf0R7GBx26Ac5A3cb3RYuLo=; b=BYABVBIedNoNagIfeG1Wq4XhIbVbWloZ0uIOVjDMCKRM3qwuMaz6MIKszoHYYiUt+0Tk9sGrN3LCtt5VgOWzpYhHr6q+B0kn+p0Zen+4TljJwkNhyO5qj6NQFNuTcK9dEyIrYWOhEzIGcni2rvkgqe8wOKq+gzaTequbCJ2V3s9xtk07vGNqcJ6y6sUxXdINM28b2dgv14PDpTOlUIRtNkIyLCJUWZq2BPGGI7aXV1fXylXzP8G/SbrLkdNxRkmHP4hmwBWqCX7Ey956zUlDx7hV5vATpTMKcIPkI21NNH327ONK4AQhZNTknKsOwEOXnIMGw1yJUV3xp4XmBweAYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Pf8MmxHcMECnOxWRPIIkJf0R7GBx26Ac5A3cb3RYuLo=; b=HD9YhUCZlYD7aa6NfB+h92S1d151UkUAtyLPv8eMm2GUH5s0WDB83gJ+sP5noz5mWKnAvoDDQ3gyhSkn+GTZUHo5apMb+dN75FhSw80NIdXvPLlcC0AU6E0l18FSWKCxCbSXcoOzY9rmH3e4fUF+SYmFS1sCI/qA7EFwa60VwzLnnZWIxbwkm6u1/Yo6qayJhvwqsMa54ipkU//cluaIIy/H1ULRX+EoIAVqzME4i8XyjCzReTvR7AHClAIcUMvSy/0wBoJBw5G+fZwsrWF57lM1psluQypJ3VxgBcq6Nc6I8qgfjguCtZDnlMwD8bJNW+bjgyyUIZbm4mh6/7qh+g== Received: from MW4P221CA0011.NAMP221.PROD.OUTLOOK.COM (2603:10b6:303:8b::16) by CH2PR12MB4151.namprd12.prod.outlook.com (2603:10b6:610:78::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Tue, 21 Mar 2023 11:53:09 +0000 Received: from CO1NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8b:cafe::c) by MW4P221CA0011.outlook.office365.com (2603:10b6:303:8b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Tue, 21 Mar 2023 11:53:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT022.mail.protection.outlook.com (10.13.175.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.16 via Frontend Transport; Tue, 21 Mar 2023 11:53:09 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Tue, 21 Mar 2023 04:52:56 -0700 Received: from localhost.localdomain (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 21 Mar 2023 04:52:53 -0700 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , CC: David Ahern , Shuah Khan , "Ido Schimmel" , Jacques de Laval , Petr Machata Subject: [PATCH net-next 1/3] net: ipv4: Allow changing IPv4 address protocol Date: Tue, 21 Mar 2023 12:51:59 +0100 Message-ID: <6ffecb0f77dc6e444e3a130a09b4fd5d717e6504.1679399108.git.petrm@nvidia.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT022:EE_|CH2PR12MB4151:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a978eff-0771-4ab5-f6dd-08db2a02d76e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ifn+Wt9M2L1Rc+QovPKYHNfKn/HfT1rdOsI+ZogVdSUDZphswwyxkSFOeV0/KtWxdYZ/2cu07nMi60uZo2K6Gwc57TvNv9fYEWI/y+XrfpQyLACiu1a6f83fz6DIknqOfbjccFhAQnkCYQcdPVZ5e0auk2y9NqlEO3Z5RqFgXedGu+h+NgGr/qXFkfUpjUausKmQw/u04eY1PY1Fpsm+NwG9K/YZeNKUcpwySbE2MoNdOzetuqSFd2RDBEvUP+PZu5r/AMhblpBni8V/fdSWsLdagBe///SiJBbkqNpuTdoygTO0CIMRPbiJdBmVeFhtv4xleJupHOI7vRuqXqKnS+NNWUJ02RBsCM4PmJMJjQUDvQqFvy179cjK+a0TBGcmEXIgYOpwkLht8V0GLbCaLVjgMsMGWHRUZ1RMQoKhlI9nQqn0LehhT0M2K1/UNetxUF3P3eAEqRiv/QAwlGKOSnp7AQsz0OfmIK6iF9aQGZq5IsAiNTQGwsryu0XoIcahWW+gb6wU30OnA0TOn30zfC0ZRJCYRZXyDS0CBQf2gHkvVTpouXM3R6xCmy/ciimTZk34PN5B/QTiWkgT+LTBrTE7eUuh/JiW59WvcLiTHsgtYRiMGBKZPlB8m2PPikIhslp+fbPuDlslyJpY3BqqZpnWdgsGaklVDHnGa+nBOy6dkY8Q1mz1+N/z7b/7Q3iSOZRxDeIclWMGoqW0epy0bD/WxskYPYGH+JYBkFJif8a5AqlbfV0VeqUA6QYd+4LA X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(396003)(136003)(346002)(39860400002)(376002)(451199018)(46966006)(36840700001)(40470700004)(86362001)(82310400005)(40460700003)(36756003)(40480700001)(83380400001)(8676002)(4326008)(316002)(70586007)(70206006)(478600001)(54906003)(186003)(16526019)(26005)(2616005)(336012)(110136005)(107886003)(426003)(47076005)(356005)(5660300002)(8936002)(41300700001)(82740400003)(7636003)(2906002)(36860700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2023 11:53:09.4169 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0a978eff-0771-4ab5-f6dd-08db2a02d76e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4151 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org When IP address protocol field was added in commit 47f0bd503210 ("net: Add new protocol attribute to IP addresses"), the semantics included the ability to change the protocol for IPv6 addresses, but not for IPv4 addresses. It seems this was not deliberate, but rather by accident. A userspace that wants to change the protocol of an address might drop and recreate the address, but that disrupts routing and is just impractical. So in this patch, when an IPv4 address is replaced (through RTM_NEWADDR request with NLM_F_REPLACE flag), update the proto at the address to the one given in the request, or zero if none is given. This matches the behavior of IPv6. Previously, any new value given was simply ignored. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel Reviewed-by: David Ahern --- net/ipv4/devinet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index b0acf6e19aed..5deac0517ef7 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -962,6 +962,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, extack); } else { u32 new_metric = ifa->ifa_rt_priority; + u8 new_proto = ifa->ifa_proto; inet_free_ifa(ifa); @@ -975,6 +976,8 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, ifa->ifa_rt_priority = new_metric; } + ifa->ifa_proto = new_proto; + set_ifa_lifetime(ifa, valid_lft, prefered_lft); cancel_delayed_work(&check_lifetime_work); queue_delayed_work(system_power_efficient_wq, From patchwork Tue Mar 21 11:52:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13182660 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EF31C74A5B for ; Tue, 21 Mar 2023 11:53:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230488AbjCULxU (ORCPT ); Tue, 21 Mar 2023 07:53:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230501AbjCULxR (ORCPT ); Tue, 21 Mar 2023 07:53:17 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2069.outbound.protection.outlook.com [40.107.243.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45DD43C37 for ; Tue, 21 Mar 2023 04:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fpB0+Afre7vmmG46XrycoxN86u+YkBOXwJG8+2Q8uy1sHnmSKtwoBc4kk8WY1kGxAZabEtRRJe62dA+C4soDUVNaomjeFyYMHGMm9Ic4+KJD5gYTBD2Dtd/DAHD24E6w7CHqBe4ey/RsbVzkG8OLXJxPbJjAs+RGzWnXrIurs3Wg/4V211ocJQO0Dwl3r57SEjZG1SgWGu6v7+3uIZ/UUjcCRKPHlsdbuHXBmMS8giPeTlJZPk3y3fBjpA4FY9VGG+iTMFh/IDDYpxr9CapQKtWaWAV9qVakqRhwZ+K69Lbx1t6ynPL4FoWK/S+OK0/huDzwQicukFadxuOXCRApQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SncSkxrYZjZub5s8HUsVzREcO0+rjC9r+cNXszIx2is=; b=DYS4509eqSlK+nkZwy79V0PoO527Nr3UZkIWo7FRVwB2pUVWHK8SuqYHQocPzkdMkLjLg9p0jiUxo0iliOQg75gDeE81zu2ovZ5mtB8ry/qw7ZxDN0JYV6aHSiPrludAgup4H5npAKWVeMP7heM6G7TvwdStUT+Th9egznV7Mh65GZuNBKtB4ijR4A95LGKt0mKaLA9xbrfJZhYK+r0LHYmKKLlmY9hVzUDDxiJt29G3dkpm5zzPIxJJGxj4hb5cKu/xUfmRIe0YCDmIRvlf+dWQmQH8TKyKeoWOO5goEpH+5EneFwwMzIkdU8nQ2xkXE9YaKp6/+WpHfbUt1bqqxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SncSkxrYZjZub5s8HUsVzREcO0+rjC9r+cNXszIx2is=; b=F8HPP1jx0M6NqL/dRsfrdsNJeC0voYFOA4Hl+wOSVOgh46uMRGSxa+YWO0d/zUn80wICr+AyNT5Rt/9S+/9/m7pum95EB3xnfSRyXPy4+dKraolXv03pdBS/5CavJpc23QyAzb6bGYg6JHVySN2nOovGzav8bl8aEnfZyX3Vxur778UocQrYQIWqNAz+Xrnl1PSagrmXrVvT6glGPHLwoRQQsayLcntG0hTQXGHbCbZRt3QLpTVkKr1ccjPFZGw2Fb6rdM9z9NvwbmG2kscsPoEtsyOOWSt6+jWfOTqItcJYK1PwDpxIFtNiv8uvhCn7KqttRjh8kW2uAPghUcwDCA== Received: from MW4PR04CA0283.namprd04.prod.outlook.com (2603:10b6:303:89::18) by DM4PR12MB6543.namprd12.prod.outlook.com (2603:10b6:8:8c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Tue, 21 Mar 2023 11:53:12 +0000 Received: from CO1NAM11FT069.eop-nam11.prod.protection.outlook.com (2603:10b6:303:89:cafe::31) by MW4PR04CA0283.outlook.office365.com (2603:10b6:303:89::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Tue, 21 Mar 2023 11:53:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT069.mail.protection.outlook.com (10.13.174.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.16 via Frontend Transport; Tue, 21 Mar 2023 11:53:11 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Tue, 21 Mar 2023 04:53:00 -0700 Received: from localhost.localdomain (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 21 Mar 2023 04:52:56 -0700 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , CC: David Ahern , Shuah Khan , "Ido Schimmel" , Jacques de Laval , Petr Machata Subject: [PATCH net-next 2/3] selftests: rtnetlink: Make the set of tests to run configurable Date: Tue, 21 Mar 2023 12:52:00 +0100 Message-ID: <7528983540119d50cc306046003b6ec878c25d89.1679399108.git.petrm@nvidia.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT069:EE_|DM4PR12MB6543:EE_ X-MS-Office365-Filtering-Correlation-Id: 42d9ac1d-1348-4288-9efc-08db2a02d8e1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fiLql3z+O3ol6LdttNni0gixBnfxppp1D4HMCRdUQpWzeFBx4eVStTD1DXhvIH5o07gEYA0Mx/6S3YNc7VOcY3pf6Jgw0yzWdjitvfCHvh2RR0rPYeGiKus8iG41AWkHbL0zEfyrAEUiCPgZooyv+Dko+6gBD0LLWpi/1hkIZprBBmXteM/IjRgNK9KWlNwJXM1ko7jJjO/0FMMAUpGhAyQJg2rIF/jgazuf3hTovk43wkpPl5XBiKz1Sm0pF8NdAfd+OQw3YhZp5St/1QEMlCM1jnvI+EqvH3ZvUdeotS/Ybj7qnjJNnhq2EXS7US1Zvohi/ii61aP3dQHpw1fcZep/G+0Mf0/57idqGB+rFzn1o5Xet92XcHbiz9f0JT0qhstw0A2Fwz3krVCikX08Ga0VQ30KVSR0QQQ8IlYi0psZN4b/9ajaEv1VkFvxmMopUqE3ig1WLNu5ySUov00aH0S9IiH0G7muqTIHaL8pov4Z0SJkygsDSVOoUbf/b1KRL2bJW+RZaLmPP/7et88g+DUJenP2K4KFcKIEcyhj12cf1TLzoP0wMXrkLGZIAQx6H80q+bj/DVxi4mKpJSIO43M09tf1vpJnR6zuGBhyTuBToFhU6jRwhPK82AR4iu4T6Xs+1APQWIMmvX11EF9F2DSg7k+m4FVHUl51Tz+VxC2iH2u5Nt+aGwjqnQkC4Rczxplvmrw3JBiHPsOIwykbpImOxPz+u1rbWVdS2GGAVqpzk+bnxQhxUwcUFLbyVWBb X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(136003)(346002)(376002)(451199018)(46966006)(36840700001)(40470700004)(8936002)(5660300002)(41300700001)(36860700001)(356005)(82310400005)(40480700001)(86362001)(40460700003)(82740400003)(36756003)(2906002)(7636003)(4326008)(47076005)(336012)(107886003)(478600001)(83380400001)(426003)(2616005)(6666004)(186003)(16526019)(26005)(54906003)(110136005)(316002)(8676002)(70206006)(70586007);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2023 11:53:11.8304 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 42d9ac1d-1348-4288-9efc-08db2a02d8e1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT069.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6543 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Extract the list of all tests into a variable, ALL_TESTS. Then assume the environment variable TESTS holds the list of tests to actually run, falling back to ALL_TESTS if TESTS is empty. This is the same interface that forwarding selftests use to make the set of tests to run configurable. In addition to this, allow setting the value explicitly through a command line option "-t" along the lines of what fib_nexthops.sh does. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel --- tools/testing/selftests/net/rtnetlink.sh | 90 +++++++++++++----------- 1 file changed, 48 insertions(+), 42 deletions(-) diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index 275491be3da2..12caf9602353 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -4,6 +4,30 @@ # # set -e +ALL_TESTS=" + kci_test_polrouting + kci_test_route_get + kci_test_addrlft + kci_test_promote_secondaries + kci_test_tc + kci_test_gre + kci_test_gretap + kci_test_ip6gretap + kci_test_erspan + kci_test_ip6erspan + kci_test_bridge + kci_test_addrlabel + kci_test_ifalias + kci_test_vrf + kci_test_encap + kci_test_macsec + kci_test_ipsec + kci_test_ipsec_offload + kci_test_fdb_get + kci_test_neigh_get + kci_test_bridge_parent_id +" + devdummy="test-dummy0" # Kselftest framework requirement - SKIP code is 4. @@ -1227,60 +1251,34 @@ kci_test_bridge_parent_id() kci_test_rtnl() { + local current_test local ret=0 + kci_add_dummy if [ $ret -ne 0 ];then echo "FAIL: cannot add dummy interface" return 1 fi - kci_test_polrouting - check_err $? - kci_test_route_get - check_err $? - kci_test_addrlft - check_err $? - kci_test_promote_secondaries - check_err $? - kci_test_tc - check_err $? - kci_test_gre - check_err $? - kci_test_gretap - check_err $? - kci_test_ip6gretap - check_err $? - kci_test_erspan - check_err $? - kci_test_ip6erspan - check_err $? - kci_test_bridge - check_err $? - kci_test_addrlabel - check_err $? - kci_test_ifalias - check_err $? - kci_test_vrf - check_err $? - kci_test_encap - check_err $? - kci_test_macsec - check_err $? - kci_test_ipsec - check_err $? - kci_test_ipsec_offload - check_err $? - kci_test_fdb_get - check_err $? - kci_test_neigh_get - check_err $? - kci_test_bridge_parent_id - check_err $? + for current_test in ${TESTS:-$ALL_TESTS}; do + $current_test + check_err $? + done kci_del_dummy return $ret } +usage() +{ + cat < Test(s) to run (default: all) + (options: $(echo $ALL_TESTS)) +EOF +} + #check for needed privileges if [ "$(id -u)" -ne 0 ];then echo "SKIP: Need root privileges" @@ -1295,6 +1293,14 @@ for x in ip tc;do fi done +while getopts t:h o; do + case $o in + t) TESTS=$OPTARG;; + h) usage; exit 0;; + *) usage; exit 1;; + esac +done + kci_test_rtnl exit $? From patchwork Tue Mar 21 11:52:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 13182661 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C470AC6FD1D for ; Tue, 21 Mar 2023 11:53:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230519AbjCULxj (ORCPT ); Tue, 21 Mar 2023 07:53:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230417AbjCULxf (ORCPT ); Tue, 21 Mar 2023 07:53:35 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2046.outbound.protection.outlook.com [40.107.243.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 289EB4BEA2 for ; Tue, 21 Mar 2023 04:53:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wr/T3lSvqnvuWaTwzJmvu5XBeEPcdP9wdjPS/H1PuwWQXMCLx1QY4ei2ssQd7RsplaT+4xKAF2u5B9kXxKhNBwfKHQQbzP+gwTuYg6Q84AGkDtpL/T4Ru97w10Rq0vKuBQXQgMqWpXZUAn7KTonJ/2ufRm5gGShBXkPq0ljvGOZOI8MA2eu6lKbRmczw57gvjY1kMguJmqMjNgcoYD6VCqPI8pnGFQWa87xBgD3eDDtk2WL+ei+RnVM0UOSMDmhWXRsokBRWYPgiaosRXnNqBx70YVC+pY7DChSD9evYT3Pimp1psNDoqp+2VQGC4bXLDhStiYwAKoVXKwXlCEqjkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oqUyGLPjjrcTzKqJa+bF4ItUAyI2ilCDEFKFU5P/Zcc=; b=XDAbZ3HpXHw+6Sp3kApDZZ0nBRDRIvf1aTxzloHIIor1y5Cql+NjqrL0q1v+ANjnB0CZsBvvR742xO/TGarC/DWqSGmynGrIkOgVrW+RUnX0a5bvwBzQjkaKKXP+0TGGJLz0fP8duBSOAv9xEcCkqUwWmKmXKASmVKhrepS4Owu97TQbwPTEe6ZkuZOPtvse/g9EVGsZz+KhgNfcvFDOgxEUip6eGkEd/QLdaFXVkX8tar8swpEIVPD+3amRJXrOm9rmU27rgAFAYYvmmU6uWk+AzNAT2v95dDUGcCK+E+SUvKe/+KkQLxcvz/3RrS5YHmNWsUMmL4/rJi0bFv8pew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oqUyGLPjjrcTzKqJa+bF4ItUAyI2ilCDEFKFU5P/Zcc=; b=Ty/PiQBBtN52pgvYSnKZW+w8Zspxhj5zmJIA5CKzCDEQMxJgZxb+zSwb9E7cMqXdYc7zaC9bPWEz698QuyM91J4iSho5z9KbAkwoNUAiJGYhe5f0cSz5f7WqrLlFGRiFvY9IqI6iCBzNlQKBSZR37GKvEQcks35oEBrITtTZFiUgIKHfE9mKQlUIW1fy5+mWMUgaTBSF97KIi8PfRSxY/X7PgIiiMC8gQp1BOSmIcdeOobHOSJRZVGZXVAhGL3qf9tu0av+wGvcHDFS9NZydCuKkwAYAw53WdxNlHpdnIITB4wjMqmhusfDl1gdcf9D/651wUSrhHgIVzqgUhzYHDg== Received: from BL1P221CA0030.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:2c5::21) by DM4PR12MB5311.namprd12.prod.outlook.com (2603:10b6:5:39f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Tue, 21 Mar 2023 11:53:21 +0000 Received: from BL02EPF000108E9.namprd05.prod.outlook.com (2603:10b6:208:2c5:cafe::ef) by BL1P221CA0030.outlook.office365.com (2603:10b6:208:2c5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37 via Frontend Transport; Tue, 21 Mar 2023 11:53:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF000108E9.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.30 via Frontend Transport; Tue, 21 Mar 2023 11:53:20 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Tue, 21 Mar 2023 04:53:02 -0700 Received: from localhost.localdomain (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 21 Mar 2023 04:53:00 -0700 From: Petr Machata To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , CC: David Ahern , Shuah Khan , "Ido Schimmel" , Jacques de Laval , Petr Machata Subject: [PATCH net-next 3/3] selftests: rtnetlink: Add an address proto test Date: Tue, 21 Mar 2023 12:52:01 +0100 Message-ID: <1d62c94b5fe3c03ee08242667304732d68bad000.1679399108.git.petrm@nvidia.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF000108E9:EE_|DM4PR12MB5311:EE_ X-MS-Office365-Filtering-Correlation-Id: 37d43e06-c715-4b6c-3e44-08db2a02de39 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k1Vjgfr/TLF8OSHVufC786QHcbP9yHi50E1oByoHcjV1c/20B3vF+4p+RKaLJjuzpyEuABo63KStWGCxogEvxNj5QC5iDVPrSGbFnDLOkQv8nSgu0LJUUA6xI6n19p363NBiEDxQwYD8T81cBXzzHYDEjl6edxgz5pZZ/UFiAcUpuMZLPaUSQdgR64BbYNYZZdUKKNjrer+2WPGMm+nhOLE227iUpQ73flhIakKLWVTr4a8q6uU4DQnVOchglq/XRDAxQA5O3gmC84cNjzRyqZ4uFIv1jD8Boqfk8sldnUz1/fdC9EqIZlSWOqjao1WKSkxE76BfmxHAXzHUp9lhH8rwyWs8Oy8ZEpSN+lE/TJLQIRKGZu5bgKV1df34xd8zqZkFk0vImZc0jFt7QdYq6TRdSuJ21986D92zpOGDFMQCKpXduATUCps5d+76c08yftYTE8QiPDBROd/pF968ewuSRnvXInH/2cEL5QKslmUT/hDXFc27+wcWHwoI1bznZrJKIxLazU9Nf3aX17DMQTwY1CI0HN/io4fFtmN8ZuYJoFG2eTn1j6sy53XLhZlpxNd7OLjbUKaSuFGgrJtQC7gE5TkSTacYWWGSMcp9FJO0umlXRdp/bJkrjG7LA1TM2qWvqjd8aM7Xl88TJA0Iu5UeD5NgujDf0EyBCc7O+XWTFeZezJSrYJgmdLZHAM8QWUoLpcv1XgH9Kcx6/eozcJHPIL0mDJPK6ffxdMAmFv+uxReH5EbHXGfL4DRqyA7i X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(376002)(136003)(346002)(39860400002)(396003)(451199018)(46966006)(40470700004)(36840700001)(8936002)(5660300002)(36860700001)(82310400005)(356005)(40480700001)(86362001)(40460700003)(82740400003)(41300700001)(7636003)(2906002)(36756003)(4326008)(47076005)(426003)(336012)(107886003)(478600001)(2616005)(186003)(16526019)(26005)(54906003)(110136005)(316002)(70206006)(8676002)(70586007);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2023 11:53:20.7464 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 37d43e06-c715-4b6c-3e44-08db2a02de39 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF000108E9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5311 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Add coverage of "ip address {add,replace} ... proto" support. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel Reviewed-by: David Ahern --- tools/testing/selftests/net/rtnetlink.sh | 91 ++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index 12caf9602353..3b15c686c03f 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -26,6 +26,7 @@ ALL_TESTS=" kci_test_fdb_get kci_test_neigh_get kci_test_bridge_parent_id + kci_test_address_proto " devdummy="test-dummy0" @@ -1249,6 +1250,96 @@ kci_test_bridge_parent_id() echo "PASS: bridge_parent_id" } +address_get_proto() +{ + local addr=$1; shift + + ip -N -j address show dev "$devdummy" | + jq -e -r --arg addr "${addr%/*}" \ + '.[].addr_info[] | select(.local == $addr) | .protocol' +} + +address_count() +{ + ip -N -j address show dev "$devdummy" "$@" | + jq -e -r '[.[].addr_info[] | .local | select(. != null)] | length' +} + +do_test_address_proto() +{ + local what=$1; shift + local addr=$1; shift + local addr2=${addr%/*}2/${addr#*/} + local addr3=${addr%/*}3/${addr#*/} + local proto + local count + local ret=0 + local err + + ip address add dev "$devdummy" "$addr3" + check_err $? + proto=$(address_get_proto "$addr3") + [[ "$proto" == null ]] + check_err $? + + ip address add dev "$devdummy" "$addr2" proto 0x99 + check_err $? + proto=$(address_get_proto "$addr2") + [[ "$proto" == 0x99 ]] + check_err $? + + ip address add dev "$devdummy" "$addr" proto 0xab + check_err $? + proto=$(address_get_proto "$addr") + [[ "$proto" == 0xab ]] + check_err $? + + ip address replace dev "$devdummy" "$addr" proto 0x11 + proto=$(address_get_proto "$addr") + check_err $? + [[ "$proto" == 0x11 ]] + check_err $? + + count=$(address_count) + check_err $? + (( count == 3 )) # $addr, $addr2 and $addr3 + + count=$(address_count proto 0) + check_err $? + (( count == 1 )) # just $addr2 + + count=$(address_count proto 0x11) + check_err $? + (( count == 2 )) # $addr and $addr2 + + count=$(address_count proto 0xab) + check_err $? + (( count == 1 )) # just $addr2 + + ip address del dev "$devdummy" "$addr" + ip address del dev "$devdummy" "$addr2" + ip address del dev "$devdummy" "$addr3" + + if [ $ret -ne 0 ]; then + echo "FAIL: address proto $what" + return 1 + fi + echo "PASS: address proto $what" +} + +kci_test_address_proto() +{ + local ret=0 + + do_test_address_proto IPv4 192.0.2.1/28 + check_err $? + + do_test_address_proto IPv6 2001:db8:1::1/64 + check_err $? + + return $ret +} + kci_test_rtnl() { local current_test