Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 989C0C433B4 for ; Mon, 12 Apr 2021 02:23:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 65ED16121D for ; Mon, 12 Apr 2021 02:23:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236608AbhDLCX2 (ORCPT ); Sun, 11 Apr 2021 22:23:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:59504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236613AbhDLCX0 (ORCPT ); Sun, 11 Apr 2021 22:23:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D1DC96120F; Mon, 12 Apr 2021 02:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618194189; bh=BpH8h+0q2wkhE9iSswcz6U7C6wyAmDd/Xq413d2lcAg=; h=From:To:Cc:Subject:Date:From; b=UYU3r2cAqbuFmhBfIyNonORjVXj0G88pW7Hgn0oSskppnkjqToPXQvHIQ5NnW8MMa 0yKdZMMsw4Q48MZj5GJydb32SfbfORe6PTTSoJLGMXQLfC013qpMdF9n64UEi6/WXH RyzUKPc8QW7cktloowmaFzkisLfLZTk5IhQFx1/igabJB1pNNTA3r5mhLarZnvGssJ ba56hRCgqOQPoXkhbZZsHjLn0NrG/su8aJ4wnOoYWuFPK+yHzo3BaiUL/AIsEKHwv5 IGU12fYMx0ZcxTGHboAwj+2f1n6SQ2IC75neZrrWAhY9tFgR1XGf2MEuQYelhgtM9J g0UV2tIfDNTEg== From: Sasha Levin To: stable@vger.kernel.org, boon.leong.ong@intel.com Cc: Jesper Dangaard Brouer , "David S . Miller" Subject: FAILED: Patch "xdp: fix xdp_return_frame() kernel BUG throw for page_pool memory model" failed to apply to 4.19-stable tree Date: Sun, 11 Apr 2021 22:23:07 -0400 Message-Id: <20210412022307.283818-1-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ From 622d13694b5f048c01caa7ba548498d9880d4cb0 Mon Sep 17 00:00:00 2001 From: Ong Boon Leong Date: Wed, 31 Mar 2021 21:25:03 +0800 Subject: [PATCH] xdp: fix xdp_return_frame() kernel BUG throw for page_pool memory model xdp_return_frame() may be called outside of NAPI context to return xdpf back to page_pool. xdp_return_frame() calls __xdp_return() with napi_direct = false. For page_pool memory model, __xdp_return() calls xdp_return_frame_no_direct() unconditionally and below false negative kernel BUG throw happened under preempt-rt build: [ 430.450355] BUG: using smp_processor_id() in preemptible [00000000] code: modprobe/3884 [ 430.451678] caller is __xdp_return+0x1ff/0x2e0 [ 430.452111] CPU: 0 PID: 3884 Comm: modprobe Tainted: G U E 5.12.0-rc2+ #45 Changes in v2: - This patch fixes the issue by making xdp_return_frame_no_direct() is only called if napi_direct = true, as recommended for better by Jesper Dangaard Brouer. Thanks! Fixes: 2539650fadbf ("xdp: Helpers for disabling napi_direct of xdp_return_frame") Signed-off-by: Ong Boon Leong Acked-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller --- net/core/xdp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/xdp.c b/net/core/xdp.c index 05354976c1fc..858276e72c68 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -350,7 +350,8 @@ static void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct, /* mem->id is valid, checked in xdp_rxq_info_reg_mem_model() */ xa = rhashtable_lookup(mem_id_ht, &mem->id, mem_id_rht_params); page = virt_to_head_page(data); - napi_direct &= !xdp_return_frame_no_direct(); + if (napi_direct && xdp_return_frame_no_direct()) + napi_direct = false; page_pool_put_full_page(xa->page_pool, page, napi_direct); rcu_read_unlock(); break; -- 2.30.2