From patchwork Fri Nov 11 01:41:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuang Wang X-Patchwork-Id: 18381 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp480415wru; Thu, 10 Nov 2022 17:43:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf7RJ1iGRrXloBl1Eu+KwMe6LjkeIhXN+/+FQ90aU3eppH+WRGolbPm6WYPnWNYvVYR+SvK+ X-Received: by 2002:a17:907:8c09:b0:7ad:a2ef:c62 with SMTP id ta9-20020a1709078c0900b007ada2ef0c62mr245143ejc.126.1668131007831; Thu, 10 Nov 2022 17:43:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668131007; cv=none; d=google.com; s=arc-20160816; b=tvZzRjT16trOHLmG5taAaP9Iw1KKuH2LSeERyUXbSVbHKUr3AwOi+GBrjjDLaPplmP Xey2kZhAyecK+E6QfRKntYuh/FLWVazt0ft6mYKbGH4xVtBjfsvZXmf1hR9ADboE82St vf0FMeQ+yketdSfgcnyFCwSfgpSr0lbHoy+U1DzXfjqtVahvTQeYBA9uQUZ3wdsI054K RdE0yU0Lxxz5kHL1CAxSxZ8zune0l7wouKYPrujCNY7hcqtO6No9LjqSbjcbmbxoOKxH EWCOJlWMz0qKJLMS/X0H1bMLLU3NnPCXy+7E8ijf6n5YI6XbM2nZE11g7kluEZboHj0u pvuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :message-id:date:subject:cc:from:dkim-signature; bh=orhM7Rfdk0osFddng1SzY4yb/5vhA8/Z7hW4tdCc1iE=; b=yHFCceKdN/AvuQsH4wY0LRQ4mRJ/PHS8SzKhvXFhZQXvRoy4XOZMtOURKrS4C9kRN8 mIJd9z20R8DRU82AMebph+Lj8tjJ04wzj43yT+CT6IhiYw25l/aACTPbUsEKpSN7Kpnu Zeb9zcU6oeKnBjh9Y3KZcJ7hFuwpMh5sfp6xvsiVbvqHnDaktfHlHJFJyQj2w8ykedS3 GJ/3kqcznxYdxePloJBUhz4aa69IVRAHBmS+CSYRvSoUHVceBodcwG+ti2lYAbAUWHLx Inzy3OtkCqYkctruJXafTepPbCIAcq6xeLXGd2KQ0qoplCZz5QUikc+V9PuqI62AK90Z 1p/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20210112 header.b=IEJbJI0+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l16-20020a170906795000b0078e1e216396si835936ejo.66.2022.11.10.17.42.55; Thu, 10 Nov 2022 17:43:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20210112 header.b=IEJbJI0+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232351AbiKKBly (ORCPT + 99 others); Thu, 10 Nov 2022 20:41:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232384AbiKKBlw (ORCPT ); Thu, 10 Nov 2022 20:41:52 -0500 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C69B627F0; Thu, 10 Nov 2022 17:41:48 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id q1-20020a17090a750100b002139ec1e999so3477118pjk.1; Thu, 10 Nov 2022 17:41:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=orhM7Rfdk0osFddng1SzY4yb/5vhA8/Z7hW4tdCc1iE=; b=IEJbJI0+sK5kz21pv/o/x5DX8Zvj+a3eJTIdDF/2KjrmEUj8QJyZmFFqy4pFcqp2Ua EKzAKeTjbanuXIOVAbip8YSN9ZoMKSo9RfjhOFAsxT9cLvjE/pd7EHAynMdywegNHndp OtC8rb8GO9CORgzHKHpmEIo3vj4Rr3vfEsUNjyaJZnDXQJcm4y1wr6yyqxWG8GfKJeOw Sz4a1VIe9DE2hHcG/hNXvh7d3QivXdNRPtsSCYzCPsyl+ikrY4S25jhzX6axRVOAExvA Z1tnVLSAJllppeZVF3drVGMJ00yHjZp7PlFuWBpFabvKZz63KNpV4zraF2rUWrUTRWNY fdIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=orhM7Rfdk0osFddng1SzY4yb/5vhA8/Z7hW4tdCc1iE=; b=YkV5/Jnd4F8+avJoj6wRYMDvvR82aKwOoTRw/huD7fGKlYcR5grGbhCZpyR+Mo/mOK YZTVlK6n7TijamQu3/fr4MPDz8/2UCMn621w2dndfXDJlp5gUi9VDiNHKndSQ2Bn+Bli 7ytDdet80KgBBbwaYWH6khyptv0Q3K0vBXkJv0CZQngpXa//1Mj8JbybDyOy9LGJfguc pXIsQBr4O/NSjbATPo9NMHOIl8n9pqXbeLF46ZrapjJ2EL78PeJdurx1HQBfcfnh4kMS tZ0DV+mKRx5dW97wsDDCfeHu9mxglG/vHd3bKMWMj4ECd6oMpXb26DoVhudGppuCLa0V jKyA== X-Gm-Message-State: ANoB5pmabIhArErzVs7fOU6KmzPOi152ke3XDw2q51Jv9WMZ/qo8wwfq 6iWxrapxD2PqV18ffwS9u5I= X-Received: by 2002:a17:902:9a01:b0:186:9c43:5969 with SMTP id v1-20020a1709029a0100b001869c435969mr105570plp.32.1668130907524; Thu, 10 Nov 2022 17:41:47 -0800 (PST) Received: from localhost.localdomain ([47.242.114.172]) by smtp.gmail.com with ESMTPSA id y10-20020aa793ca000000b00562cfc80864sm317578pff.36.2022.11.10.17.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 17:41:47 -0800 (PST) From: Chuang Wang Cc: Chuang Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Braun , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v2] net: macvlan: Use built-in RCU list checking Date: Fri, 11 Nov 2022 09:41:30 +0800 Message-Id: <20221111014131.693854-1-nashuiliang@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749162139638720696?= X-GMAIL-MSGID: =?utf-8?q?1749162139638720696?= hlist_for_each_entry_rcu() has built-in RCU and lock checking. Pass cond argument to hlist_for_each_entry_rcu() to silence false lockdep warning when CONFIG_PROVE_RCU_LIST is enabled. Execute as follow: ip link add link eth0 type macvlan mode source macaddr add The rtnl_lock is held when macvlan_hash_lookup_source() or macvlan_fill_info_macaddr() are called in the non-RCU read side section. So, pass lockdep_rtnl_is_held() to silence false lockdep warning. Fixes: 79cf79abce71 ("macvlan: add source mode") Signed-off-by: Chuang Wang --- v1 -> v2: - fix the patch Subject, add a Fixed tag v0 -> v1: - fix typo drivers/net/macvlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 578897aaada0..b8cc55b2d721 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -141,7 +141,7 @@ static struct macvlan_source_entry *macvlan_hash_lookup_source( u32 idx = macvlan_eth_hash(addr); struct hlist_head *h = &vlan->port->vlan_source_hash[idx]; - hlist_for_each_entry_rcu(entry, h, hlist) { + hlist_for_each_entry_rcu(entry, h, hlist, lockdep_rtnl_is_held()) { if (ether_addr_equal_64bits(entry->addr, addr) && entry->vlan == vlan) return entry; @@ -1647,7 +1647,7 @@ static int macvlan_fill_info_macaddr(struct sk_buff *skb, struct hlist_head *h = &vlan->port->vlan_source_hash[i]; struct macvlan_source_entry *entry; - hlist_for_each_entry_rcu(entry, h, hlist) { + hlist_for_each_entry_rcu(entry, h, hlist, lockdep_rtnl_is_held()) { if (entry->vlan != vlan) continue; if (nla_put(skb, IFLA_MACVLAN_MACADDR, ETH_ALEN, entry->addr))