From patchwork Fri Nov 2 15:36:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 150058 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2223791ljp; Fri, 2 Nov 2018 08:37:37 -0700 (PDT) X-Google-Smtp-Source: AJdET5fkjBfcCNJmxXOlSFnkr/IIkR7FatE8UVDcmHRVRMan9rqppT3Y9bdf2tvdOKxRewhskv4k X-Received: by 2002:a63:6883:: with SMTP id d125-v6mr11303701pgc.451.1541173057621; Fri, 02 Nov 2018 08:37:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541173057; cv=none; d=google.com; s=arc-20160816; b=hz0p4H+czl+R5d0IouxZJ9Pb5+RKX2azttJ36CFG+wQVHEc5NQTJ59+AIj4iUAF989 CiamfZLVrNpEiaomPpvhQbkCOIOSMJWcf2HyNr3gwMm9f7+U+iwWq11ZGpjxjrR1S6WQ EyYKZcf0bN3R5ZounhXs03M4/Sd2og2YKed1HBTbhErEwEzP9jXyKAL92IzaWibtzTGU 8TETl1s7cNoO3SKdywcF6qQZiJM3pfD1ARNWvFM5kKK3si95M1DG8bPoxuo+0v46SSc5 zkeWgi7NR0iVnZx7D3c4gQV6LuxjrE3+BTTqwPyiN4CPjxV33YqnUOJ7adDIZlxi2XS2 dh4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=VakdV5OI4+PWk4KR46e4f4gGwAkQmCLubZzQWO8qD1Q=; b=0ejzV8IWtbl1zy/zg0xqsZtMs3Ul1t+1c50FeUxbjzEBNoUwmJ7QCxf/qOC4on0zOL YwuRtSf5Q0SVdr7poGKF5SaFfrBgb8gAE7SzASqpN6RSrccmvjJIyto0ZH2Fj6MgFcP3 GW+f0Wl1iqL2C60iar6BQ4mZyDdsfrCzpTHUTwuZs3/sxoy6Go75zLIx1nxP7EAw8FC7 Pr33lhlwbH+ZrxxNYoxLm2qQYzG3+S3U3ZcAyJjYORSfk4Id/zG/37PJ70J3qDOcJXUi ABWtLMWsni2Kf6IMVVIYd8bSggRQDIjzWwhGMSH9kTvIk20BZxaCgamGqwEMXazdRUn0 7AZw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k198-v6si37134886pga.12.2018.11.02.08.37.37; Fri, 02 Nov 2018 08:37:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727982AbeKCApD (ORCPT + 32 others); Fri, 2 Nov 2018 20:45:03 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:53901 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726085AbeKCApD (ORCPT ); Fri, 2 Nov 2018 20:45:03 -0400 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MDy9C-1gQGTA1v5I-009xLM; Fri, 02 Nov 2018 16:37:08 +0100 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MDy9C-1gQGTA1v5I-009xLM; Fri, 02 Nov 2018 16:37:08 +0100 From: Arnd Bergmann To: Pravin B Shelar , "David S. Miller" Cc: Arnd Bergmann , Pablo Neira Ayuso , Florian Westphal , Flavio Leitner , Gao Feng , Thierry Du Tre , Yi-Hung Wei , Ed Swierk , Julia Lawall , netdev@vger.kernel.org, dev@openvswitch.org, linux-kernel@vger.kernel.org Subject: [PATCH] openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS Date: Fri, 2 Nov 2018 16:36:55 +0100 Message-Id: <20181102153705.1664786-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:urUdUvoTEdrqek+SKJTQs2jQeQgrpSU97Fo622stFo9wXsiMdk0 PR44sBdwgkd2fHw8XexyV9OZzKMOplk26JcG+ON64YOI5kFi5oAJmE7MHXJeFUN9n/O+WLw pdNTW5BY9NvdBf0DNGYXqfZbRdqk2thF3SaYUeT8os/zkenUsds/cpdJ2VOlhLYXs6UqJg3 vbl4qe9zD0CLw4HgonaTg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:6lrbs4gOJAk=:42gvTR4v9Sz1k2ejgvKP2X LI0tdyov+VefpmcC7AuZKBh6bW4v0JDQoiO8bgT3jCYYz/x5Cjs0G/4sTZZZ2yrA+33AIU/V1 CJvl06NiUK7KnWH2+Z/GhjHIrnr5qrZ06y3JuYpMGGKC08gDAtXxX1E816Z+P3tn5kSszLbQy VBelmv/VIs44A2sEHF9aPcTthqaj4qEjxc5rccw48xX9KyEy/7oxLXR7Wk6CUQ332p9Wcx7a8 dNf82x+aET1cqXQiv485RJHWOwSeapXsWZvwoSnemm46E8H6FapEyIoDJuOUb/NtsTwQp/mtN 1QgBc/ywQ+4PqMqKfm8yTZbdwCYWCDO6xwUtLTmQi0y3vUJgmmL6FjD+RGIe3e7SpQQg8HF2C k/0VB90xIsBKcp/tj2JZlo6wTTdkaczuAwS7OUKJpdiAOE0RapaKYxSO1ARy3qqNxE8GQlcUd R9Dh6zhnABFwco84kKRJ60tKu9NdREzxhWHSHtubTIVkPiZUJEAvYeu3+zzlcr2ERUwlKgVwM fc4aYucMQPN9JabTrw4JCf2BwnVC2rHd/C6ej5iVE7BQswlNJWN8ncopcjQ0+4qZMXlXjjVUZ 2p+/mjZWDuurWPWu/3+SBCCGvkrZI9C7gLlypkQgUu2p9/Nlpy2bnYuu9fhZY2P+JymDUfvA3 ICQXkhsofTTGrcSg57R/aWY5fcGyXrB3oL76SfZvAkFaYFWxkCmyU2e2ZtXx/SFMm+nY= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_CC_OPTIMIZE_FOR_DEBUGGING is enabled, the compiler fails to optimize out a dead code path, which leads to a link failure: net/openvswitch/conntrack.o: In function `ovs_ct_set_labels': conntrack.c:(.text+0x2e60): undefined reference to `nf_connlabels_replace' In this configuration, we can take a shortcut, and completely remove the contrack label code. This may also help the regular optimization. Signed-off-by: Arnd Bergmann --- net/openvswitch/conntrack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.18.0 diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 6bec37ab4472..a4660c48ff01 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -1203,7 +1203,8 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key, &info->labels.mask); if (err) return err; - } else if (labels_nonzero(&info->labels.mask)) { + } else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) && + labels_nonzero(&info->labels.mask)) { err = ovs_ct_set_labels(ct, key, &info->labels.value, &info->labels.mask); if (err)