From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E411641C54; Thu, 9 Feb 2023 16:27:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A1404161A; Thu, 9 Feb 2023 16:27:59 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2122.outbound.protection.outlook.com [40.107.220.122]) by mails.dpdk.org (Postfix) with ESMTP id 72EB2410EA for ; Thu, 9 Feb 2023 16:27:58 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A256uk94vVFutRxBWts2+Kl9dR9BsnO1A8HqhL5eBRSRbv/EilDIviIEoCZK2JWZ4hUYVeSVjbJPdHKcT1SwbepGIh/nXbBsXxSFwC7xdfr8luPhQWEckHoP+0Pc27gDEFjlf/rGWzFz9BwoWh8DkEIwPJP79bxZAZ/cP3aGlul3VdAKT4hF6q9Hf7Gr58K3hC8VdhnaU0lLct3k6lf+cPv1oHNfs7CAoKb66h/cRzGJIS4Jm+XbrWVA8hV92QahMT7NuG/y5wFgnr8AH++Ag63af05LMKWKaxDBjav0vCwOZVS1F8I5Q2CZUucz/taI43tQpouJ8ALXrmmuLBQgBQ== 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=F3O+mpJDOWwrLawjXg0nLY6Oe0vni6ZOFn+JkzBxS7Q=; b=Gi0LrIyHAPJao30lQgBeJ6SDzfyDt2WjjxkqVul+YXv6D7rVqMSy1DrDabS7Ks8qysVh5LC3N9zJBxwqUYWvNrrco3e7GgOkItzRaJiGnMcCTuSh5oYFPnRoiU/i+0CHV3s2mks/axRMkqHYwL1Dkh8a/Qd7Zns7PKgS3XKk1/rtWDvhkunPhR9ekYBQljREBijNchkIwb1YXmjWbruUsk5XWCdj+FdvXUM/GQfqfid/mY4cN8UB/dFNkBWS8WLc1OZXeKV2tDfuiaEZKD2FygcGM9o8UwC+Q3Z6AhO4mLDkkuMyCB867lKroFtfMKjkvrHDYY11D+ysLLPTSF4Nww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F3O+mpJDOWwrLawjXg0nLY6Oe0vni6ZOFn+JkzBxS7Q=; b=vMsgNkBgq51y2XpWC8ue6t+CtIHx8Yi57rZS64UckTgYmJBMzNJAG317zuNQ9f/BAL0EryuNtIfTkc5HBu6zBvwuzCdCUaUWB5kggPYBXRmvGmGHLsl5aqJzUguwsSxFTfKvdIumnCU9u8DDfacKNFcKva0M5g3+UWz33VYGV3w= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) by CO6PR13MB6031.namprd13.prod.outlook.com (2603:10b6:303:14b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.19; Thu, 9 Feb 2023 15:27:55 +0000 Received: from SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba]) by SJ0PR13MB6037.namprd13.prod.outlook.com ([fe80::90b0:f667:bccd:64ba%9]) with mapi id 15.20.6086.017; Thu, 9 Feb 2023 15:27:55 +0000 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: dts@dpdk.org Cc: oss-drivers@corigine.com, Qin Ke , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Chaoyong He Subject: [PATCH v2 1/5] framework/dut: add support for restoring dual-port NIC with single PCI address Date: Thu, 9 Feb 2023 16:27:13 +0100 Message-Id: <20230209152717.4057220-2-niklas.soderlund@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209152717.4057220-1-niklas.soderlund@corigine.com> References: <20230208164624.2997614-1-niklas.soderlund@corigine.com> <20230209152717.4057220-1-niklas.soderlund@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: FR3P281CA0127.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::13) To SJ0PR13MB6037.namprd13.prod.outlook.com (2603:10b6:a03:3e2::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB6037:EE_|CO6PR13MB6031:EE_ X-MS-Office365-Filtering-Correlation-Id: 255fbc56-35e2-4796-ee20-08db0ab235fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iMuyeTmS+rIZgRpvo7QzuZYK+ue6VjTrGZTq4rE/3iHvK9U9w+lkph0NMI8IcnZe3SfOEwBqoySGbVb+CQ1mLNr8kCvu50rfSIXRNhbmHbBW0LAZrDjAhOMWWXZj6Qu/VgBGE2ff3DB2EhLw6z/vFY/ZYBaSgvsq/rZYMJp3frvmgFGzLDxuzw3MzM/SN7IwMyfpMkdMfqqtr4+iud2RsbzQyEMHpHd54SN68TE3AFu8pBuF8Q7uE3oqVEUGtejOLirSAu5nBiIMzROxgKRYaprHcPsOalSl6ZybRFnjlEQ4AWkvWGl9WhgpQAXTTNIggephTqHciYmwhWF6sVaebidNzLaKj5SraxLmjqMnJnQK+aq+uDeTKXccgYM/X+lxGKZti65mh7QMlTtyvuJz20GuqtkF7UsDERGJyWZBNHp0tFcH9LX3SnG9GKjNgST7GuBzvUpL3lix/sQCYY72wnTD5ocUaRGitt2FYd2MB9KdjhQeQIe8VF83phuvxSu+L9QXW/j6WfdZXt/R4OdizE/4rXm7tVx1ovcnH6BoggH92K9+I7ZA0Zifu8TWu0qEJ/alMHSmEmI1dkaFi25VQlSqUhmgtaXYLjUO5VCrLeG1dqtFhvZLoBjzbaCDAUQBfvxw0+McJGSK6d2o3XaNKneA3ooxugbQRZRza9p5wytXssSlhPsMvJMgIu/zGQXiy8q7QEi6y4dinMHtD3yBfQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB6037.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(346002)(376002)(366004)(39840400004)(136003)(396003)(451199018)(8936002)(83380400001)(2906002)(66574015)(2616005)(186003)(316002)(478600001)(66556008)(8676002)(66476007)(4326008)(6486002)(66946007)(6916009)(52116002)(54906003)(6666004)(6512007)(6506007)(26005)(1076003)(5660300002)(41300700001)(36756003)(38350700002)(38100700002)(86362001)(107886003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aGlLNnl5SmdYUUxlQm9EZkE2TzI5d3MydUhVRVZFZEp1TjAyUVRlWU9TbGZo?= =?utf-8?B?b3BOa1pjWHJUSzB5ODVYK2FPMXhEaTlrZUo5OEgvTnRZNjVoZk9Pa21XUWts?= =?utf-8?B?Qmt2cFpQQ0VHU1dzd2xscDc2dmlkbzlXbm1sQWMvMjlhOStRQzV3YmFuSVh2?= =?utf-8?B?RVFjMlQ2OUNlYTBnU0FqaGFWb0VidGxDVG1Qa0pISitMM1dCR01Nb1ViMGl3?= =?utf-8?B?N21vWkdEY2s3RXRMRVpKNzFHamNMc1oyaGpSSGxNREFYU0JGVHAydFArK1Nq?= =?utf-8?B?YWdhcGR5OVdqRy9NRGl3Q3FScERRREoxK0pQOGtBQmhxRVVCMU15aXh5VFRV?= =?utf-8?B?YUh4eno5UFFJczZBQ0NoV3EzdENEQXpidVc0ekFHTFFUb3NhVmFCY1phSG05?= =?utf-8?B?dDBvNC9DcU9KVXQ4T2JCNVNuR0I2bE11RXlRWkdRR1VjL1pGU2lyWFhVK2M0?= =?utf-8?B?ZnlFdkpEbW9oNVJweE9oekhRYzgzb3FxcWhQYjNITkhzc3M1aW13elFoUTlT?= =?utf-8?B?bFRpUFIvYUNlRzRMOHhQN3gzNXlPTXNJYk9CWGM2Qmk1VEVUUG9kbndrVXdD?= =?utf-8?B?VHVQT090eEo5RXNmVmE0QW9ZSDZHUityNUlZK0dKWFgzaTdUVUgzQWZTV1Zp?= =?utf-8?B?VkVHclFmNWhSLy9ndlpCSTZOVWFpdkNKaHVrSXhmY1p6akx5UkViU0NSTHpR?= =?utf-8?B?UVUrTjhOVVc0OE04YWN4MTlqTWRRNWZnSXRwQjBuWDcycGl6VEVxbktVd1Zn?= =?utf-8?B?dWJWZ3V0UUhvaDNnaWNmUHplNUEzWVJSZldKTE50eHZyQ3p6WHRyVlFnVlJk?= =?utf-8?B?WGtnZjF0K2lXYmJYSEJvd1k3TGQ4bnpvNjJ6WUNTblorUnBMUHl0dGZYekZH?= =?utf-8?B?RG9zUlFaL1JHcWZJb1g5ZXV3TmhaVnBWZWJIOHpaa1VrS1ZxWGJyYXNZZFln?= =?utf-8?B?QWN2bmoveVk1OTc1WkFJeGtZbHJGKzFyZTk1ZHVVUVlNcFI0ZkVRdkQ4bUM0?= =?utf-8?B?bjVvTFMrRTRVSUVIVVBGR1lwbzhGVENZUmlMN3lDSzBMN2xkaWRObVlSanFh?= =?utf-8?B?VFROamNvZlNQQ0RkRmtNQ25uZlRPYmwwRUVOa3RIOXREejhPcUFIc1RFcnEx?= =?utf-8?B?a0Z4V1hZVG9NQksreXY4WFU5UlEzQnZDOWNWOWZOVGMwbGtEeUIxWncvNHE1?= =?utf-8?B?TXpsR0xLUTc3TEtYQXdEWHNlZUFXS1diajN0R083YUw0cGMxK2k3aHNNbCsz?= =?utf-8?B?eEdXWlN0ZGo5RDhGV1pnelJqZThwTW4vOVlBelhpbDhxMFNIRFZjMkYrY0pq?= =?utf-8?B?amd0WCtQdkszY0Z3RkpmUmpCOFpacEJNRzNrWHRUcG0zUlV6M092bldWWHEw?= =?utf-8?B?ZTU4MzJvQVZ4cFN0UmtLYlk4TCtoWkxOMTg4NzFIMUwvYm10ZElBank1NXpB?= =?utf-8?B?eWJXRlhKTEFrOUFzcmdJV0tIZytWRHA2RGJkMVRDNTY1NlhkL2wzM0lvSFd0?= =?utf-8?B?b0NwbmZhc28xODcyclpJV1AvdG1lMEk1cE5JZTl5OXpUendaN2lmdkJNN1lB?= =?utf-8?B?dmd1elYzTFdLVS9od3dNczRQelZNU21iaG5QdnJMZGdUZ3NwRDI0ZWZyYVZl?= =?utf-8?B?M1ZRMnhtekZZc0t1U3lKNjlBUUl3eXI1bUhJYkJEUTFhY0lhV0ljYWtUZ1Zi?= =?utf-8?B?QlI2L3I5R1Z6SndxS3VSQzBFYWpqQ3FMOTRGUFZuUVhiYVBBVlBPZk1oNkow?= =?utf-8?B?MUx6aE9ibDl1em1NajdMUEd6NkpLNGhWRERVMndBWDZabVFRTDh3RjFUV0Za?= =?utf-8?B?OHd2MldjL1VsZEh0R25aa2lpMDREZnF4Tm4xOFRmVDY4U3VrdTJ6SUFnakww?= =?utf-8?B?N3hIR2g1UnlBKzBiOWdvS1ZiWHMyeFdhYlphQ0kxZ2lXSHdMRE1SWDFReFpM?= =?utf-8?B?dEJKc0ZJbG5yZ2RETWVVdDFLVG91NUEvejlMZk0xVG1oQzdyL1FVMVJlbTZS?= =?utf-8?B?SjBCTm9FaW5ZYU96bHFodk9RNDhoRFErVEdFVEZJR1NXZFhoS2h2U0dwbTVz?= =?utf-8?B?Y2FyNXV5K3VDWEpxSjdDVmdJdXBYYWtqRFpGU0FXT1FJdUxkMjhpS0QrVE9F?= =?utf-8?B?L3Nia0d6WUFQZ0wrTVR2QUJSVVJ6N25Id2c4NHlOY0U5N2l6TnE5UU13WDRZ?= =?utf-8?Q?soy38Tn+nqCGzIe/BN1fka0=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 255fbc56-35e2-4796-ee20-08db0ab235fa X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB6037.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 15:27:53.1181 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dkgLuGCiIWoFQi3jWFanJe5dMENFmK+RfmfYxf0e7jCU3b9Y31mUZv0p01gsFyr0TW+bFrQyCvZaTyTIk0dlmJIuyXhHQGgL2jroBoDZ5ek= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR13MB6031 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org From: Qin Ke The functions of restore_interfaces and rescan_ports get the incorrect interface and mac for the second port of the NIC which has two ports but single PCI address. Add support for it by adding the filed of port_id for port_info, then it can get correct interface and mac by distinguishing port_id. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He Signed-off-by: Niklas Söderlund --- framework/dut.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/framework/dut.py b/framework/dut.py index 481c0cb6abe8..eb988ac3e265 100644 --- a/framework/dut.py +++ b/framework/dut.py @@ -402,9 +402,9 @@ class Dut(Crb): """ Restore Linux interfaces. """ - for port in self.ports_info: - pci_bus = port["pci"] - pci_id = port["type"] + for port_info in self.ports_info: + pci_bus = port_info["pci"] + pci_id = port_info["type"] # get device driver driver = settings.get_nic_driver(pci_id) if driver is not None: @@ -431,7 +431,10 @@ class Dut(Crb): pull_retries = 5 itf = "N/A" while pull_retries > 0: - itf = port.get_interface_name() + if port_info["port_id"] == 1: + itf = port.get_interface_name() + else: + itf = port.get_interface2_name() if not itf or itf == "N/A": time.sleep(1) pull_retries -= 1 @@ -865,13 +868,19 @@ class Dut(Crb): for port_info in self.ports_info: port = port_info["port"] - intf = port.get_interface_name() + if port_info["port_id"] == 1: + intf = port.get_interface_name() + else: + intf = port.get_interface2_name() port_info["intf"] = intf out = self.send_expect("ip link show %s" % intf, "# ") if "DOWN" in out: self.send_expect("ip link set %s up" % intf, "# ") time.sleep(5) - port_info["mac"] = port.get_mac_addr() + if port_info["port_id"] == 1: + port_info["mac"] = port.get_mac_addr() + else: + port_info["mac"] = port.get_intf2_mac_addr() out = self.send_expect( "ip -family inet6 address show dev %s | awk '/inet6/ { print $2 }'" % intf, @@ -1017,6 +1026,7 @@ class Dut(Crb): "type": pci_id, "numa": numa, "intf": intf, + "port_id": 1, "mac": macaddr, } ) @@ -1035,6 +1045,7 @@ class Dut(Crb): "type": pci_id, "numa": numa, "intf": intf, + "port_id": 2, "mac": macaddr, } ) -- 2.39.1