From patchwork Wed Jun 23 11:07:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 466251 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.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 C78E3C4743C for ; Wed, 23 Jun 2021 11:08:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B18DB61003 for ; Wed, 23 Jun 2021 11:08:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230526AbhFWLKe (ORCPT ); Wed, 23 Jun 2021 07:10:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59946 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230234AbhFWLJ5 (ORCPT ); Wed, 23 Jun 2021 07:09:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624446460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2arA4F9H8piXSu2BaYZfrwo91oZXpALZLKMt5odcOCY=; b=RM0QewaZCDtUVr6mp4IlKWBtXVEtWd4JRiw+i2sKlCa8zcyAL0tSbtZxz8Cuxk+ZU4jJBC IyxY8+Gsx3FxzsJO92AHCoFuhSjaJgwgSy3lLxYaif7JYVdwqcOyKqy6Vkd4g++KfXq0pH vvUNnCWe4x1eC9XzOIL0lbIBJg0SeFg= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-86-Wcu1KxwTNxiQiMROZyGsHw-1; Wed, 23 Jun 2021 07:07:38 -0400 X-MC-Unique: Wcu1KxwTNxiQiMROZyGsHw-1 Received: by mail-ej1-f71.google.com with SMTP id jw19-20020a17090776b3b0290481592f1fc4so853512ejc.2 for ; Wed, 23 Jun 2021 04:07:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2arA4F9H8piXSu2BaYZfrwo91oZXpALZLKMt5odcOCY=; b=jsapL2uD7qXYtvkndT29l4w9IkDogO95NRT2O2v5yVKnf8vRDOI8DQ+rbD/jADt5lO 5U5v3xbdN1ozDBmOWUTCyNaUSS1jcG3S1hV3/0PaZSoypr2j1x4ewKqGS//q1jA74s/7 IBXIdgqeVebSyyCj4dIVX7NdX0phbTTZDd9sjnaj4xmIAMs9fncIpBarfnCuEdA6ZI6o l18KaQzXpuoc5oUkS8+4mAo0nkFeB/eYCG01O8q+HfiurHgUEBwiGI4IMfdxYLC44ePv kIlGfv63ugWFKeuWQlbDjhLYaiC7/bYw9z95JX/kpvJdW8MeFXQpcv/bCVZjzrjwGzle YAuQ== X-Gm-Message-State: AOAM533c3uCLTXDoFjYU10PZDUU6jkzpSwdQD+XOHbpspvMFqT+9mf4w 4VRdL//W20HoxAd7ueFF70zYX4uDm+uPUpXG6liXbzOXMM1iGRFKxobhCcWo0v1X9cMBDWQqIP4 asxq90hZloyTyQfkP X-Received: by 2002:a17:906:190c:: with SMTP id a12mr9070038eje.491.1624446457192; Wed, 23 Jun 2021 04:07:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfYOxCXGNl6WwCkAT61NO9Jw5DYitkekz8LmF8VlrNsuA0TOsWQBt9kYvTmODjjA976dI+eg== X-Received: by 2002:a17:906:190c:: with SMTP id a12mr9070029eje.491.1624446457054; Wed, 23 Jun 2021 04:07:37 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id jl21sm5514474ejc.42.2021.06.23.04.07.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 04:07:35 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 32D22180739; Wed, 23 Jun 2021 13:07:28 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: bpf@vger.kernel.org, netdev@vger.kernel.org Cc: Martin KaFai Lau , Hangbin Liu , Jesper Dangaard Brouer , Magnus Karlsson , "Paul E . McKenney" , Jakub Kicinski , =?utf-8?q?Toke_H=C3=B8iland-?= =?utf-8?q?J=C3=B8rgensen?= , Sunil Goutham , linux-arm-kernel@lists.infradead.org Subject: [PATCH bpf-next v4 09/19] thunderx: remove rcu_read_lock() around XDP program invocation Date: Wed, 23 Jun 2021 13:07:17 +0200 Message-Id: <20210623110727.221922-10-toke@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210623110727.221922-1-toke@redhat.com> References: <20210623110727.221922-1-toke@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The thunderx driver has rcu_read_lock()/rcu_read_unlock() pairs around XDP program invocations. However, the actual lifetime of the objects referred by the XDP program invocation is longer, all the way through to the call to xdp_do_flush(), making the scope of the rcu_read_lock() too small. This turns out to be harmless because it all happens in a single NAPI poll cycle (and thus under local_bh_disable()), but it makes the rcu_read_lock() misleading. Rather than extend the scope of the rcu_read_lock(), just get rid of it entirely. With the addition of RCU annotations to the XDP_REDIRECT map types that take bh execution into account, lockdep even understands this to be safe, so there's really no reason to keep it around. Cc: Sunil Goutham Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Toke Høiland-Jørgensen --- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index c33b4e837515..e2b290135fd9 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -555,9 +555,7 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, xdp_prepare_buff(&xdp, hard_start, data - hard_start, len, false); orig_data = xdp.data; - rcu_read_lock(); action = bpf_prog_run_xdp(prog, &xdp); - rcu_read_unlock(); len = xdp.data_end - xdp.data; /* Check if XDP program has changed headers */