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 2648FA0A0E for ; Mon, 10 May 2021 18:05:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 208E240140; Mon, 10 May 2021 18:05:04 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2057.outbound.protection.outlook.com [40.107.92.57]) by mails.dpdk.org (Postfix) with ESMTP id 30B3E40395 for ; Mon, 10 May 2021 18:05:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jO6KUKkiYidyRsnuOQP3JxJEfINsjsRA5w3xVrnRnXYO4l4JCSrrHWBPDWBlWqNKbLvj3/gxW2Of4TTzZDVWm6ihaOeoZ6he6d396EU+uhsu9Ak+WmbNGMfsxTIoSsk2xRjABo9K+FCH1RZddXQq+yGWaQYyuGOzzUTcl3ohIZkxz3CFC1cZYBRuKQaow2YoyvMooMpH+UHA/gmibyuae8HOcGQEYpqWzFlNXvxArPSYpy0NR17xIkp4Ecju2OTzjr37yCzNyma6hJSDfIKnC9kg8Uhdhw19VD43kd8ptJJ5XCA09tvoq/Da1bmWojt/lKv4r5QDWXXusAAQUaHAWA== 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-SenderADCheck; bh=3TdSVFV5eMF61BL2TsImeunHdB0OQdaBVNDkrp5mRAg=; b=OqBmOz7saigFkaZFuSmL7NPiz5SYAcrU+jHQ/7A9Z7d4bQsu5eY1f5HFecWK3soEqc468S3R2fYhgehuldRd+pp/DxcaiKJx4WzU92rpkKfEOQhJEN0B+qXzA4x3KZFMImx12URtdisoDc2R+HJHwLcVM87SF9U/lc3f0Qftk5CmhR5dL/WYTAEZNyTtJuEeUd2DNB1JLbld9jyxwfs3MUBEjP/jBqCo21GGDzEp/B/lnnUeSOR1X8Nna0CbnFH3ZkjmgnbJceNKDw3apzoGgzvOJzAyreOU/jqsY642y/1N6RdbV9tf3yWlKd9Bn1byEEaHRhhEsFHk5OVdOQJl7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=3TdSVFV5eMF61BL2TsImeunHdB0OQdaBVNDkrp5mRAg=; b=tOhZSYBmnPjqeB84LF2/54H69YoZX9oIZhQxtBxbtRCcMNyV6GC0cVo5X+8/jt7ShDY+78otjViIkpGhe5AxnsZ3X/5FyYIdjcBn2Cwyw+ibnLHUyxMjVvadCFJJs9x+iGEVGM4hiULNrPZaY5H3djvFPrTKXPi79kMhfJMGr+4PKyZEIhsur7JyXQA5F1dNyRplBVSkiuIGU8N8QjRqPmr50uI/fpepoqBhf23CosWzDa2Hko0HRbsR3o351sF82+iwBvaxFVieFSSaAPYVP92nzqnz4V+qo6XHAmqzeBYkd7VF6FYd6qz+DYn3mLokKzRKCOAMauJ788wzj3A2KA== Received: from BN6PR21CA0014.namprd21.prod.outlook.com (2603:10b6:404:8e::24) by DM6PR12MB3468.namprd12.prod.outlook.com (2603:10b6:5:38::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.30; Mon, 10 May 2021 16:05:00 +0000 Received: from BN8NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:404:8e:cafe::e1) by BN6PR21CA0014.outlook.office365.com (2603:10b6:404:8e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.1 via Frontend Transport; Mon, 10 May 2021 16:05:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT048.mail.protection.outlook.com (10.13.177.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:05:00 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:04:58 +0000 From: Xueming Li To: Ciara Loftus CC: Luca Boccassi , dpdk stable Date: Mon, 10 May 2021 23:59:27 +0800 Message-ID: <20210510160258.30982-18-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a4a9b78-e5c0-416e-c697-08d913cd5d52 X-MS-TrafficTypeDiagnostic: DM6PR12MB3468: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yRc/vzb+gTNtoolvhCZ4bBxNSoVqWWd2J42xfYu1fUF8ToyUZDXzenETaeLBCEOpiP3JCu+sJc0UlmjAXKajEcHB4SoROsVhfXI49vXsU+WYtHh0Dk4Hr7iatUz9aRYvt3oPCJkyq6TXsxXtpQzgzeO9Z6TsnwhAcuvkxthHs+UrlNtf1yJHuVo45uIVsv8Zt6y86+EP78/FDSmg0FDZXHZk4yD6PX+vTW6fPICqb6b/0UhcsN3VpkvZx67xbYwMhluqbDBZZm1AIrJWG7t+ubhRWvoBMjcQ9EIM0rYiuOeLgUequwd7MofCEhiD4gR9AwQsNioLP+p9HHu/cA6Zs3MDFnDR+x9RUCIiWTxQScthSqQMyAoszY9ayZQp9HIfr5/0FkKC/uX/J94esGVv9iAFAAZQsue1i0vwDyw61LZl/YvbLyj8Ih3HlFiLvdpOMBb4bio2GLyjaEWBjvvHTmSurQ2RxmWO63HPiGQ+lHmOCdc8xLSWT1ts9P8FMuJ3VIyWICz88V0+N7ECErYRqOkcH/Ld/Sq/ReQkCtQg+4lRJ80N94v23BjW/+f7n2xOAIus7S70uwqcFQ7dW0JW43iPxK1bTnEtPXkuoYMx+YsREJdofpxdR92B56ZSObA3HsOqE0ln5wafcPQRYBxMIPjbMY+l0xJYoNVdF+cDMtANVLb5FLMeOOqYmswq3i6m0b1oAsgB/wqGesivWLzoHXZucTMDikND7J0xCDgtYuju7tOXA7WUWGlIQGuzia90t2hb3mwJnhSjSO39iYqvpw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(346002)(396003)(136003)(376002)(46966006)(36840700001)(82310400003)(6916009)(966005)(82740400003)(316002)(6286002)(7636003)(4326008)(336012)(478600001)(8936002)(70206006)(83380400001)(70586007)(356005)(2616005)(2906002)(54906003)(186003)(5660300002)(6666004)(86362001)(36860700001)(55016002)(36756003)(26005)(53546011)(1076003)(8676002)(16526019)(47076005)(426003)(36906005)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:05:00.2546 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7a4a9b78-e5c0-416e-c697-08d913cd5d52 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3468 Subject: [dpdk-stable] patch 'net/af_xdp: fix error handling during Rx queue setup' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/40313397da9b14ce38354e781976c2b0a25e00f6 Thanks. Xueming Li --- >From 40313397da9b14ce38354e781976c2b0a25e00f6 Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Mon, 1 Mar 2021 10:34:13 +0000 Subject: [PATCH] net/af_xdp: fix error handling during Rx queue setup Cc: Luca Boccassi [ upstream commit 831268022300cfbc338f65d43b8f685e50011c86 ] Prior to this commit, if rte_pktmbuf_alloc_bullk failed during rx queue setup the error was not returned to the user and they may incorrectly assume that the rx queue had been successfully set up. This commit ensures that the error is returned to the user. Bugzilla ID: 643 Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks") Signed-off-by: Ciara Loftus --- drivers/net/af_xdp/rte_eth_af_xdp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 7fc70df713..3885fb7c78 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -1148,7 +1148,8 @@ xsk_configure(struct pmd_internals *internals, struct pkt_rx_queue *rxq, } #if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG) - if (rte_pktmbuf_alloc_bulk(rxq->umem->mb_pool, fq_bufs, reserve_size)) { + ret = rte_pktmbuf_alloc_bulk(rxq->umem->mb_pool, fq_bufs, reserve_size); + if (ret) { AF_XDP_LOG(DEBUG, "Failed to get enough buffers for fq.\n"); goto err; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.189219400 +0800 +++ 0019-net-af_xdp-fix-error-handling-during-Rx-queue-setup.patch 2021-05-10 23:59:26.340000000 +0800 @@ -1 +1 @@ -From 831268022300cfbc338f65d43b8f685e50011c86 Mon Sep 17 00:00:00 2001 +From 40313397da9b14ce38354e781976c2b0a25e00f6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 831268022300cfbc338f65d43b8f685e50011c86 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index b8d5ad0d91..3957227bf0 100644 +index 7fc70df713..3885fb7c78 100644 @@ -24 +26 @@ -@@ -1145,7 +1145,8 @@ xsk_configure(struct pmd_internals *internals, struct pkt_rx_queue *rxq, +@@ -1148,7 +1148,8 @@ xsk_configure(struct pmd_internals *internals, struct pkt_rx_queue *rxq,