From patchwork Tue Jun 15 14:54:45 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: 12322589 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=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 B9A31C48BDF for ; Tue, 15 Jun 2021 18:06:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 871DD61042 for ; Tue, 15 Jun 2021 18:06:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 871DD61042 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vjRS56wHZR9ZVanmrOZsc21jEjfRRQtIBF8He8hzKCQ=; b=ptUQveoZEe98eE 8OvEUooFdFug0V7mVQw0xlmJ6Z43GFklteT60ySEeHfSvCrJqsjhj/3zkbH5FEOwPF9RDRDQEoF2p 5zMLhsVKQkBebUdArROrZzn+y7hcoM/6WUAYaZUhfSQQxpmEIc1wnYwl/1x0V+CWqRHBVGf/BooxV LhX+NyAYsn591H75Niz9/d17BsYsUxe7FQ0nTyOK6FITyIk4wok6/tPU9uILB7rwF0epoY+U3LJQC jigVf6coSmfwNr5FzSLMKZNmVCgxbBDZnY0i2JamhJWPwvLBPLH1c2Dre8TtxX7Y5BWKruMFvXwEs 85ZaMsGZWy2u4hTejnhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltDPw-001xme-LS; Tue, 15 Jun 2021 18:04:06 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltATC-000jsc-DR for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 14:55:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623768911; 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=UuVwKA1OMw5HxgYVzw3xNIdTf1mnrwsBt+MXeIcnXmI=; b=KWMIOcSnesUdvKLTHhla1KtT0lqYryzamIQssqCQQKvzEwW1gdQ11zBBroP1NmMo+Yfewl OQm8OOeGaf+wyhHCWHsPwCLSZakJKvpDm1C9EUu7QG5Nj7y6DSq0LcAgJtYS7iaAm8P6fa 90AwYQxtpIAs4TgJxN09QujmQZ6f9NQ= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-301-1rrZqGDQPX-xwiY3694vsw-1; Tue, 15 Jun 2021 10:55:08 -0400 X-MC-Unique: 1rrZqGDQPX-xwiY3694vsw-1 Received: by mail-ed1-f69.google.com with SMTP id v12-20020aa7dbcc0000b029038fc8e57037so4214613edt.0 for ; Tue, 15 Jun 2021 07:55:07 -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=UuVwKA1OMw5HxgYVzw3xNIdTf1mnrwsBt+MXeIcnXmI=; b=YsXrnTQ18Cg5WiKd2av74euwIPK5DtzOTTMpEPJzsZn2dDH9Us/mq8mpEzgkMc3npy CgS09T805fllHw5NIrKuxqUi8mffduZeouiueOl77uhdaqdhNHPxGZ0p7zzMI+BJLKgZ JK5c2eB2FDqCK78dKzKu/VXHyzGEoEfnNKDdHi2MC9KaKONOK5bmy8PbR9aTg1xZ8CC2 axArvw6FVZoXs0wary5YXo8vkB6N/5GbQXAsHF6HDubkxta+MbMvJVSxDISB3NlvkZ+m 98lAnznwpEQPMhYae8A1QvYaLOyt06Z2d/yKmxf5MgZ2DfzzujuMvZPjXnK2oLeJcWNA Areg== X-Gm-Message-State: AOAM532VwW4AQUVlJyHsZRIPtpld3JHH83RfSoh5N9J6kLqy7/AJxtp8 J/De6kBqS1oZ6HxMlQAM5JLOxdC9dxb0g9DJKt25/h/TxyF5ymyDSjTHRxoOLj2xK29CITNipmq N9vGjILWmJqi/9ycnIaHSuwGlNPJQe05wnDE= X-Received: by 2002:a17:906:86d2:: with SMTP id j18mr20741201ejy.180.1623768906892; Tue, 15 Jun 2021 07:55:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWpfiZnqpYkM92g7guVvXh6FJ1+oiuUPPVMTAPBLOqzvhVwFA4IyVKuSf3Gx69P5gjjEnkoA== X-Received: by 2002:a17:906:86d2:: with SMTP id j18mr20741184ejy.180.1623768906755; Tue, 15 Jun 2021 07:55:06 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id u15sm12524316edy.29.2021.06.15.07.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 07:55:04 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id D550418072F; Tue, 15 Jun 2021 16:54:58 +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-J=C3=B8rgensen?= , Sunil Goutham , linux-arm-kernel@lists.infradead.org Subject: [PATCH bpf-next v2 06/16] thunderx: remove rcu_read_lock() around XDP program invocation Date: Tue, 15 Jun 2021 16:54:45 +0200 Message-Id: <20210615145455.564037-7-toke@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615145455.564037-1-toke@redhat.com> References: <20210615145455.564037-1-toke@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=toke@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210615_075514_614775_CFEF5BCA X-CRM114-Status: GOOD ( 16.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index c33b4e837515..1d752815c69a 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -555,9 +555,10 @@ 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(); + /* This code is invoked within a single NAPI poll cycle and thus under + * local_bh_disable(), which provides the needed RCU protection. + */ action = bpf_prog_run_xdp(prog, &xdp); - rcu_read_unlock(); len = xdp.data_end - xdp.data; /* Check if XDP program has changed headers */