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 F1B99A0560; Tue, 18 Oct 2022 21:48:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E65A742B77; Tue, 18 Oct 2022 21:48:22 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2071.outbound.protection.outlook.com [40.107.223.71]) by mails.dpdk.org (Postfix) with ESMTP id 7E0134282F for ; Tue, 18 Oct 2022 21:48:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TT+rarOOQ8aEmNaS3fBf6MsHbKyjmbPwed5Qza3Sfj6x/TzUPTbq/enh12c0jIjWMsHUKLJUCSWfima07TKSblYDgEygU47NnseTU00GlkuweAsuNrj/XHV1ZvDT5gs71NXZWjEh9STxtkcdUlt0K8mWRYjKW/t4eSLJtY6J53CA7O0ouwx5PVkoOAsWc6DRnlYu8s708/QPD4zzaR0EyCdxQxwcQ7OxK+RIODdRLH5Hjy9+LXQXp2eC8AJOOZBT2ehxB8vfoYURAy/zaU1b4VawNw/u1qUap81ZBneOKXtIHXg9bWU2GmvIhFAbbKLibccUc7jtluP4hSDJuZKuWw== 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=LlcvdoKp8bmaHhpUOyyVvE2v42bEkhEYKiFFkxD6trI=; b=jT6KZkeFbzTIGG9T7wa4AEFBFDEmWRLqUNdcRtFjp5LJSBHNwcQSBQ3JBVPp4deHK0qFJQmnDl00zMBmi94DVEZRfYg/6vjxPtNHoZ0vVjv4qXVkZTShIAjrIYtQRNL/nHskwwMxy3jp1/TgvDLXorygMEpywN++dCRCR5d1x18HfG6O5bR4oWZty5l/5ejX9NCxWAzBoo0XPAkLd0Atka1igkeUDXxTmI+UHBQ80V5AQgP7vA2gtP6xb4D9M23hA/YrfIsY9WOoMAF6nIP+ga5NI3+hrzvURwJ8mlo7nJbv4jtCNSlOBdRPxaD/DIYwwCgRE9YbDLUaKUCkLQ/yrw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LlcvdoKp8bmaHhpUOyyVvE2v42bEkhEYKiFFkxD6trI=; b=wd3qs1Jr+z0fz73tIk5+RPo+LXLRl/My3+bZNZvk+xlZ5G6AVOa3xt5QJurGCrcw1tbKuP0JyFY6gXIT0h4W3tycHhrhGMQItkmospa7rZ0SwT7bDlXkhvYITyAYu9vlPBy1Bc8+GJQC5vPWosR916/qeXCPB2cZ4hPPVmAAxI4= Received: from DS7PR06CA0031.namprd06.prod.outlook.com (2603:10b6:8:54::11) by CY5PR12MB6624.namprd12.prod.outlook.com (2603:10b6:930:40::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.32; Tue, 18 Oct 2022 19:48:19 +0000 Received: from DM6NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:8:54:cafe::3e) by DS7PR06CA0031.outlook.office365.com (2603:10b6:8:54::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31 via Frontend Transport; Tue, 18 Oct 2022 19:48:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT024.mail.protection.outlook.com (10.13.172.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5746.16 via Frontend Transport; Tue, 18 Oct 2022 19:48:18 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 18 Oct 2022 14:48:18 -0500 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v2 34/36] net/ionic: use a helper variable for page size Date: Tue, 18 Oct 2022 12:41:29 -0700 Message-ID: <20221018194131.23006-35-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221011005032.47584-1-andrew.boyer@amd.com> References: <20221011005032.47584-1-andrew.boyer@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT024:EE_|CY5PR12MB6624:EE_ X-MS-Office365-Filtering-Correlation-Id: e3d7cee3-6092-4f41-7b78-08dab141b4b9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZtjnH+qxUM6QD0IPvknb0KkB4tBHB2AKhm8TNjOqY+IRL27QT8l7ZxseJ6M/C0tmAJjwSW6TrtoLKY4eTYV6i85dOTMXcxe8e32+15B/Q8cPnZSat7uC21Xva7AKU/+EuJA7nP1OstkamlpXbGRZvgAYrT5+gK9kYk3xk4FQTxawQBnbPLY74Htf7Q3MHfGl3go8DrNmlWm5eGHvQlI/7KrFeLwi+RwxLxtUg2kr074qrRiasA0VcWVEzt/rawSOoUCDPh7UloT57hCfzbCGKUVorHRUIIWVaRCkZY5eUXSx+wOSsxlD4GYnDVLwymjdv/s9tpkYxJ5Bx3Jemd89kgminlVWmhWvsP/pg/PCbxNLP9j1BmxNw7NiiHdd8nPOFrTViv9BYwyGcs8oUjg04+DgucSsLchEudpQFDYbxfVsCWH59QHoTG+61OooUt5i/MRZ6LdHL4+tXnSTtyTihhcfY3mKNFTcMfu4J6YAtZ0lFs+2qfZqgo1IfA85YP1nlRGibr4KrYpoc/oZEAUM3aSpLb8TxaadwmUUY8lULJXqiVOPH0BBzy6jatSdjr5TYn6uzrckz5uWYcpCacx7wszAgSqeplp95l84o68b64g14k2cLG7t9pkIYqLa3Qmw8zEvME99LUqVdzbhb+Z2vAvU7/aa82LqT9uSwwmSpLPgng+gcOJcxFiwhq2S3tJOMxpV3GugwEd5wj8UrkvIK41N3alcKWMRRj8/dxpsCAbrO5vhfDwWDuJXZpe+ZkX0r+xZhBuvxrDu9DodPNrL8HayuLkaeEkXWS1SHJEzS5ZE0h2Iil9wyK2J+QGNztAB X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(376002)(346002)(39860400002)(396003)(136003)(451199015)(36840700001)(40470700004)(46966006)(2616005)(41300700001)(6666004)(70206006)(8936002)(6916009)(36756003)(4326008)(478600001)(8676002)(70586007)(36860700001)(16526019)(26005)(44832011)(81166007)(356005)(40480700001)(82740400003)(1076003)(86362001)(186003)(40460700003)(82310400005)(426003)(83380400001)(47076005)(316002)(336012)(2906002)(5660300002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 19:48:18.8766 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3d7cee3-6092-4f41-7b78-08dab141b4b9 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6624 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This improves readability. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_lif.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 383fff9ffd..1b5932db12 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -576,6 +576,7 @@ ionic_qcq_alloc(struct ionic_lif *lif, rte_iova_t q_base_pa = 0; rte_iova_t cq_base_pa = 0; rte_iova_t sg_base_pa = 0; + size_t page_size = rte_mem_page_size(); int err; *qcq = NULL; @@ -584,18 +585,18 @@ ionic_qcq_alloc(struct ionic_lif *lif, cq_size = num_descs * cq_desc_size; sg_size = num_descs * sg_desc_size; - total_size = RTE_ALIGN(q_size, rte_mem_page_size()) + - RTE_ALIGN(cq_size, rte_mem_page_size()); + total_size = RTE_ALIGN(q_size, page_size) + + RTE_ALIGN(cq_size, page_size); /* * Note: aligning q_size/cq_size is not enough due to cq_base address * aligning as q_base could be not aligned to the page. - * Adding rte_mem_page_size(). + * Adding page_size. */ - total_size += rte_mem_page_size(); + total_size += page_size; if (flags & IONIC_QCQ_F_SG) { - total_size += RTE_ALIGN(sg_size, rte_mem_page_size()); - total_size += rte_mem_page_size(); + total_size += RTE_ALIGN(sg_size, page_size); + total_size += page_size; } new = rte_zmalloc_socket("ionic", struct_size, @@ -610,7 +611,7 @@ ionic_qcq_alloc(struct ionic_lif *lif, /* Most queue types will store 1 ptr per descriptor */ new->q.info = rte_calloc_socket("ionic", num_descs * num_segs, sizeof(void *), - rte_mem_page_size(), socket_id); + page_size, socket_id); if (!new->q.info) { IONIC_PRINT(ERR, "Cannot allocate queue info"); err = -ENOMEM; @@ -648,16 +649,13 @@ ionic_qcq_alloc(struct ionic_lif *lif, q_base = new->base; q_base_pa = new->base_pa; - cq_base = (void *)RTE_ALIGN((uintptr_t)q_base + q_size, - rte_mem_page_size()); - cq_base_pa = RTE_ALIGN(q_base_pa + q_size, - rte_mem_page_size()); + cq_base = (void *)RTE_ALIGN((uintptr_t)q_base + q_size, page_size); + cq_base_pa = RTE_ALIGN(q_base_pa + q_size, page_size); if (flags & IONIC_QCQ_F_SG) { sg_base = (void *)RTE_ALIGN((uintptr_t)cq_base + cq_size, - rte_mem_page_size()); - sg_base_pa = RTE_ALIGN(cq_base_pa + cq_size, - rte_mem_page_size()); + page_size); + sg_base_pa = RTE_ALIGN(cq_base_pa + cq_size, page_size); ionic_q_sg_map(&new->q, sg_base, sg_base_pa); } -- 2.17.1