From patchwork Fri Dec 15 17:07:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 179431 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9435760dys; Fri, 15 Dec 2023 09:16:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IEjfM3LmDQxySKTyO6kO9mb8CoomINhmpLxV5m7CEqZidbX0RRmzKs5RPamiCeAGlxr97QM X-Received: by 2002:a17:907:7e99:b0:a19:67f:943c with SMTP id qb25-20020a1709077e9900b00a19067f943cmr7305494ejc.21.1702660568564; Fri, 15 Dec 2023 09:16:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702660568; cv=none; d=google.com; s=arc-20160816; b=H+LJuw7toaSjvWa/fLs2PcT6M0Qjds6NeAaLG4cFVFoaUyWCpnAmBSOwxOl+V8ItvE 2OXnCfvrQpQG0Jl9sk6JzCw/RIq+MuXFkZps5Gw/RiESPJDtN+v9tuo9hdh/Kyi7i9gm cWTLz5Ok038LlQHf9mQNY/J3oUJze4+beTjZ4Ntg6gCpEdcTJPad2wp1K9venJliG438 G5NCz1XRX8BWTulO1ImCWHo1yvXNPG++UFXG6N5xQsiAYSU8H8waeDv8qGup4nqHorI9 D6n2Nu7SE6+jQmCyAisyN5ayYbvKMJ3kuGvCZHINQT+nBuM3RvGlmrSQciJN7czSvD4Y hjTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=hccXJ/tMSuJL/qI6XmVbVx3Yyp9L6BDQI7DM1y19Tvc=; fh=/jtzt/OMiRfUf/HyCpd2gbQecls8mvrgQhoSfrfID6w=; b=m7cjP9pIvwDpExErI9/PcSpkL9YNS5WlazCV0RJIgZYA61VAbg12yJR6/uJubt55k6 bo47L79RAM1OAGOWDKNDPiCcrF8Ql4IPN4hCf/8T3iN+HdO40CG5znwz7GWrcMFKJHwA 4QVUcdvjeigE2mZNeTZd1Vr3DTruo29+tewLEAJa6iyXMUSVtd4SiGR4xMY19iS4PGhX yaKAJSITavR6PYi3hzMAXAYEcmEOXs8Ks8EGVFbJIvAXtIgwtDkq/sPAkPyBcueQr5aa OyB7FM7DOIqzi/qHeI9IPiVnn9d1saBIwi2BH3JVtma46NEH/I8mMmJSga0jOsPuBaLo 8kow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=H1NRUxma; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=tUXBTMv6; spf=pass (google.com: domain of linux-kernel+bounces-1373-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1373-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id n23-20020a170906379700b00a1db7922c75si7183332ejc.608.2023.12.15.09.16.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 09:16:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-1373-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=H1NRUxma; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=tUXBTMv6; spf=pass (google.com: domain of linux-kernel+bounces-1373-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1373-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 1FE161F239E8 for ; Fri, 15 Dec 2023 17:16:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D47B86A013; Fri, 15 Dec 2023 17:10:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="H1NRUxma"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="tUXBTMv6" X-Original-To: linux-kernel@vger.kernel.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58ACD46426; Fri, 15 Dec 2023 17:10:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1702660236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hccXJ/tMSuJL/qI6XmVbVx3Yyp9L6BDQI7DM1y19Tvc=; b=H1NRUxmaM4/3shLHnigobXH0+djwJ1RJjGPcIJDlF0N7BGrPMdnqPLHiELW8Hmlx1noC0i r1wj1L5ePShhZxc82oHWsH6Hw9DhpjoZLDGLaU8lR+VVLxHtWBk9567g8GWAZ/BOAjqTuZ nHIlJlGUKulxv4K5ZmLb4Gk6KO/F8bKZ8ya24TNtsI09icbM/d8III+vyi7PGeQIELym7F wSrjfAj6u3oZXkd3eX3oE+LERBTkt/OC7BBSHGzwEClzZpbU+TzxyLOj/Qt7Uhs4s4Xlnz U/nMajMYyWPC5h66bEfxOJoI4i9s6vEgWoFzcVZHEoGFOD0Kka/Y6RUnRFvwrA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1702660236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hccXJ/tMSuJL/qI6XmVbVx3Yyp9L6BDQI7DM1y19Tvc=; b=tUXBTMv6dK1TkctQDlxmz7vleUMV7iKdmqarsfLl2XSKRjSuNxKw9tqGuTSp2hU5RMl7XJ IAK0IVGYLLdl/1DA== To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: "David S. Miller" , Boqun Feng , Daniel Borkmann , Eric Dumazet , Frederic Weisbecker , Ingo Molnar , Jakub Kicinski , Paolo Abeni , Peter Zijlstra , Thomas Gleixner , Waiman Long , Will Deacon , Sebastian Andrzej Siewior , bpf@vger.kernel.org Subject: [PATCH net-next 11/24] lwt: Don't disable migration prio invoking BPF. Date: Fri, 15 Dec 2023 18:07:30 +0100 Message-ID: <20231215171020.687342-12-bigeasy@linutronix.de> In-Reply-To: <20231215171020.687342-1-bigeasy@linutronix.de> References: <20231215171020.687342-1-bigeasy@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785369008124880664 X-GMAIL-MSGID: 1785369008124880664 There is no need to explicitly disable migration if bottom halves are also disabled. Disabling BH implies disabling migration. Remove migrate_disable() and rely solely on disabling BH to remain on the same CPU. Cc: bpf@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior --- net/core/lwt_bpf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c index 4a0797f0a154b..a94943681e5aa 100644 --- a/net/core/lwt_bpf.c +++ b/net/core/lwt_bpf.c @@ -40,10 +40,9 @@ static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt, { int ret; - /* Migration disable and BH disable are needed to protect per-cpu - * redirect_info between BPF prog and skb_do_redirect(). + /* Disabling BH is needed to protect per-CPU bpf_redirect_info between + * BPF prog and skb_do_redirect(). */ - migrate_disable(); local_bh_disable(); bpf_compute_data_pointers(skb); ret = bpf_prog_run_save_cb(lwt->prog, skb); @@ -78,7 +77,6 @@ static int run_lwt_bpf(struct sk_buff *skb, struct bpf_lwt_prog *lwt, } local_bh_enable(); - migrate_enable(); return ret; }