From patchwork Fri Sep 25 13:16:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1371289 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4ByXVh24fwz9sPB for ; Fri, 25 Sep 2020 23:16:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728836AbgIYNQZ (ORCPT ); Fri, 25 Sep 2020 09:16:25 -0400 Received: from mailrelay112.isp.belgacom.be ([195.238.20.139]:52973 "EHLO mailrelay112.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728814AbgIYNQZ (ORCPT ); Fri, 25 Sep 2020 09:16:25 -0400 IronPort-SDR: lAsdkI1iOSoCmuM1HFCdnPuFg7TJRwX3a9KTEHcvv3zdaRl2DgzapcT6xq2oVoAWc948leSeRQ ina3g2yhvB7TE7TQgwcvkTQJPgYlzjS3LYhzHX8uvKz4cHZvy1dJfzOJHO1t7RjFvrRq4Qeo2q BOWL3c8iwlPpXm0++t9yeFP5LbzM38RfyO04rKxAOaXSI+ZrEfyMXaOLdO0rzco/cSeJJVkofz Zfk3iLDLPWdETU5arxysClA0+JRSHFjSiYg1e2Sb5/rvh+8wX8CuTO9spqAxUQQAYk3ABXEaoS Gow= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:nZ/nNBOWH1jaD7Gxbv0l6mtUPXoX/o7sNwtQ0KIMzox0K/z8pMbcNUDSrc9gkEXOFd2Cra4d1KyM6+u9CCQp2tWoiDg6aptCVhsI2409vjcLJ4q7M3D9N+PgdCcgHc5PBxdP9nC/NlVJSo6lPwWB6nK94iQPFRrhKAF7Ovr6GpLIj8Swyuu+54Dfbx9HiTagY75+Ngu6oRneusQWhYZpN7o8xAbOrnZUYepd2HlmJUiUnxby58ew+IBs/iFNsP8/9MBOTLv3cb0gQbNXEDopPWY15Nb2tRbYVguA+mEcUmQNnRVWBQXO8Qz3UY3wsiv+sep9xTWaMMjrRr06RTiu86FmQwLuhSwaNTA27XvXh9RwgqxFvRyvqR9xzYnbb4+aL/dyYqDQcMkGSWdbQspdSypMCZ68YYsVCOoBOP5VoYnnqFQVrBuxHw+sD/7vxD9SmHD5wLM10/4gEQ7a3wwrAtUDsHrOo9ruOqcfSvu1zKrIzDXFcfxWxS3x55PWfR04p/yHQL1/f9bLx0Y1CwPFkkufqZbjPz6N2OoAsGyW4ephWO+vlWIqpQF/ryWzyssxloXEh40bxF/Z+Ch33os4ON21RUxlbNCrDJdeuS6UOo92TM0iXW1lvCA3waAFt56jZCUHzIkrywTCZ/GEbYSE+A/vWeeRLDtimX5oebSyjAuo/0e60O3zTMy03U5PripCj9bDqGgA1wfW6sibUvt9+Vqh2SqX2wDT9O5EJUc0mLLfK54m3rE/jJ4TsUTEHi/thEX6lquWdkI49eey7+Tof7LmppqGOI91jAHyKqUumsqhDuQkKgUDW3WX9f6h2LDg40H1WqhGg/w2n6XDrZzXJNwXpqujDA9U1oYj5Qy/DzCj0NkAk3kINklKeBycgojyOFHPIPb4Aumjg1i2izhk2ejKPqf9DZXVMnjDjLDhcK5g5EFG1go809Vf6olJBb4bPvL8RErxtNjfDh83Lwy42eDnB8th1okGQ2KAHreZML/OsV+P/u8vIPSMa5QPtzvmKPgq+eTujXknll8ZZ6Wp2oEXaH+gFPR8P0qZeWbsgssGEWoSuwo+T/Hqh0acXjFPeXmyXLkx5iomCIK9E4jPXJyigb2Z1iehApJWfnxGCkyLEXrwcYWLResMZz+MLc9/iTEES7ehRJE71R20tw/11aBnLuzK9S0cr57j08J15+LLnxEo6TN0F9id032KT2xsmmMIRjk23L1woEBkyVeMz7J4g/pGGtxX/P5JTAg6OoDGz+BgCND9RBjBftGXR1aiWNmmBisxTt0pyd8Uf0l9A8mijgzE3yeyDb8ajaeEBJIv/6LH3HjwJ8B9xGja1KU7lFYpXJgHCWrziqdh+g37C4fXnkCdkKi2M6IRwGqF93qJxEKNsVteXQo2Vr/KDl4FYU6Dg93z50rEB5G0BLgqKApKyobWJKJAZPXyjkRASeulMtmIMDH5oHu5GRvdnuDEV4HtYWhIhCg= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJikgQLAQEBAQEBAQEBNQECBAEBhEuCMSU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig0cLASMjgT8SgyaCWCm4PzOEEIURgUKBNgIBAQEBiCuFGoFBP4RfijQEtz2CcYMThGmSTA8ioRCTCKIYgXpNIBiDJFAZDY5WjhJCMDcCBgoBAQMJVwE9AY4fAQE X-IPAS-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJikgQLAQEBAQEBAQEBNQECBAEBhEuCMSU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig0cLASMjgT8SgyaCWCm4PzOEEIURgUKBNgIBAQEBiCuFGoFBP4RfijQEtz2CcYMThGmSTA8ioRCTCKIYgXpNIBiDJFAZDY5WjhJCMDcCBgoBAQMJVwE9AY4fAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 25 Sep 2020 15:16:23 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org Cc: mkubecek@suse.cz, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Fabian Frederick Subject: [PATCH V2 1/5 net-next] vxlan: don't collect metadata if remote checksum is wrong Date: Fri, 25 Sep 2020 15:16:02 +0200 Message-Id: <20200925131602.56461-1-fabf@skynet.be> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org call vxlan_remcsum() before md filling in vxlan_rcv() Signed-off-by: Fabian Frederick --- drivers/net/vxlan.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index b9fefe27e3e89..47c762f7f5b11 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1875,6 +1875,10 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) !net_eq(vxlan->net, dev_net(vxlan->dev)))) goto drop; + if (vs->flags & VXLAN_F_REMCSUM_RX) + if (!vxlan_remcsum(&unparsed, skb, vs->flags)) + goto drop; + if (vxlan_collect_metadata(vs)) { struct metadata_dst *tun_dst; @@ -1891,9 +1895,6 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) memset(md, 0, sizeof(*md)); } - if (vs->flags & VXLAN_F_REMCSUM_RX) - if (!vxlan_remcsum(&unparsed, skb, vs->flags)) - goto drop; if (vs->flags & VXLAN_F_GBP) vxlan_parse_gbp_hdr(&unparsed, skb, vs->flags, md); /* Note that GBP and GPE can never be active together. This is From patchwork Fri Sep 25 13:16:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1371290 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4ByXW120ZVz9sSn for ; Fri, 25 Sep 2020 23:16:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728882AbgIYNQm (ORCPT ); Fri, 25 Sep 2020 09:16:42 -0400 Received: from mailrelay112.isp.belgacom.be ([195.238.20.139]:53006 "EHLO mailrelay112.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728121AbgIYNQl (ORCPT ); Fri, 25 Sep 2020 09:16:41 -0400 IronPort-SDR: pvB6/BqLSD6nCV6jzNQwttKSF6G2Cfouh+/UZue2RMLukfsYpc+4BX4hl+AhZF/BUMWj91w21+ Yd753wYr0m5ERCRZLY1BYwpZoN5sbPVFltK+7V+WbEEHWlaGn+H1Naf195fZHHztoHxQLN4Z5a pAu2HCZajpdpsmi/o5m3admjrioVrME0n+ZIFL6f+CnHv2ZIxM7FOAiID7R4aWrISwvFr+u425 O3LRKuSfaLWJ6jgjWoUOXCDEiFNO9EnRRGATCtmNNVN+HKZBlm9wneL+k3dNB8EQi4rQX0iLif RVQ= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:DpaXJBMzJh/VqhcVQtQl6mtUPXoX/o7sNwtQ0KIMzox0K/z8pMbcNUDSrc9gkEXOFd2Cra4d1KyM6+u9CCQp2tWoiDg6aptCVhsI2409vjcLJ4q7M3D9N+PgdCcgHc5PBxdP9nC/NlVJSo6lPwWB6nK94iQPFRrhKAF7Ovr6GpLIj8Swyuu+54Dfbx9HiTagY75+Ngu6oRneusQWhYZpN7o8xAbOrnZUYepd2HlmJUiUnxby58ew+IBs/iFNsP8/9MBOTLv3cb0gQbNXEDopPWY15Nb2tRbYVguA+mEcUmQNnRVWBQXO8Qz3UY3wsiv+sep9xTWaMMjrRr06RTiu86FmQwLuhSwaNTA27XvXh9RwgqxFvRyvqR9xzYnbb4+aL/dyYqDQcMkGSWdbQspdSypMCZ68YYsVCOoBOP5VoYnnqFQVrBuxHw+sD/7vxD9SmHD5wLM10/4gEQ7a3wwrAtUDsHrOo9ruOqcfSvu1zKrIzDXFcfxWxS3x55PWfR04p/yHQL1/f9bLx0Y1CwPFkkufqZbjPz6N2OoAsGyW4ephWO+vlWIqpQF/ryWzyssxloXEh40bxF/Z+Ch33os4ON21RUxlbNCrDJdeuS6UOo92TM0iXW1lvCA3waAFt56jZCUHzIkrywTCZ/GEbYSE+A/vWeeRLDtimX5oebSyjAuo/0e60O3zTMy03U5PripCj9bDqGgA1wfW6sibUvt9+Vqh2SqX2wDT9O5EJUc0mLLfK54m3rE/jJ4TsUTEHi/thEX6lquWdkI49eey7+Tof7LmppqGOI91jAHyKqUumsqhDuQkKgUDW3WX9f6h2LDg40H1WqhGg/w2n6XDrZzXJNwXpqujDA9U1oYj5Qy/DzCj0NkAk3kINklKeBycgojyOFHPIPb4Aumjg1i2izhk2ejKPqf9DZXVMnjDjLDhcK5g5EFG1go809Vf6olJBb4bPvL8RErxtNjfDh83Lwy42eDnB8th1okGQ2KAHreZML/OsV+P/u8vIPSMa5QPtzvmKPgq+eTujXknll8ZZ6Wp2oEXaH+gFPR8P0qZeWbsgssGEWoSuwo+T/Hqh0acXjFPeXmyXLkx5iomCIK9E4jPXJyigb2Z1iehApJWfnxGCkyLEXrwcYWLResMZz+MLc9/iTEES7ehRJE71R20tw/11aBnLuzK9S0cr57j08J15+LLnxEo6TN0F9id032KT2xsmmMIRjk23L1woEBkyVeMz7J4g/pGGtxX/P5JTAg6OoDGz+BgCND9RBjBftGXR1aiWNmmBisxTt0pyd8Uf0l9A8mijgzE3yeyDb8ajaeEBJIv/6LH3HjwJ8B9xGja1KU7lFYpXJgHCWrziqdh+g37C4fXnkCdkKi2M6IRwGqF93qJxEKNsVteXQo2Vr/KDl4FYU6Dg93z50rEB5G0BLgqKApKyobWJKJAZPXyjkRASeulMtmIMDH5oHu5GRvdnuDEV4HtYWhIhCg= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJikgQLAQEBAQEBAQEBNQECBAEBhEuCMSU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig0cLASMjgT8SgyaCWCm4PzOEEIURgUKBNgIBAQEBiCuFGoFBP4RfhASGMAS3PYJxgxOEaZJMDyKhEC2SW6IYgXpNIBiDJFAZDZxoQjA3AgYKAQEDCVcBPQGLWYJGAQE X-IPAS-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJikgQLAQEBAQEBAQEBNQECBAEBhEuCMSU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig0cLASMjgT8SgyaCWCm4PzOEEIURgUKBNgIBAQEBiCuFGoFBP4RfhASGMAS3PYJxgxOEaZJMDyKhEC2SW6IYgXpNIBiDJFAZDZxoQjA3AgYKAQEDCVcBPQGLWYJGAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 25 Sep 2020 15:16:39 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org Cc: mkubecek@suse.cz, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Fabian Frederick Subject: [PATCH V2 2/5 net-next] vxlan: add unlikely to vxlan_remcsum check Date: Fri, 25 Sep 2020 15:16:18 +0200 Message-Id: <20200925131618.56512-1-fabf@skynet.be> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org small optimization around checking as it's being done in all receptions Signed-off-by: Fabian Frederick --- drivers/net/vxlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 47c762f7f5b11..cc904f003f158 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1876,7 +1876,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) goto drop; if (vs->flags & VXLAN_F_REMCSUM_RX) - if (!vxlan_remcsum(&unparsed, skb, vs->flags)) + if (unlikely(!vxlan_remcsum(&unparsed, skb, vs->flags))) goto drop; if (vxlan_collect_metadata(vs)) { From patchwork Fri Sep 25 13:16:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1371291 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4ByXWR3hBZz9sSn for ; Fri, 25 Sep 2020 23:17:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728905AbgIYNRD (ORCPT ); Fri, 25 Sep 2020 09:17:03 -0400 Received: from mailrelay112.isp.belgacom.be ([195.238.20.139]:53047 "EHLO mailrelay112.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728121AbgIYNRC (ORCPT ); Fri, 25 Sep 2020 09:17:02 -0400 IronPort-SDR: j4hNMfuq5CSYQYaEIQJGu8KqlMc6/hszWlwqCeEnxZpNZabx7BYo8QbWscV3RqovnGRNBvv4cg I1DZfH82ClABXFIK4zVS+PYMZ0NMjgVUY64y+vKsC6dHC/jafwqpM/nSWmNsZ/eor68neDOIQO GEejyvcAjWoxhOl6aKDCKwJ+/CvBXJAKNbgkl3pHyM+WkParmsPRlWgAm2BqySkd7MPT3ZL/RM 8Biw5RjZPktdFjLjamGZxVpJlCO6sP6UJB6wv9do0kKHa/RrGXvILbVGU9SHAzSNjbxEdZ4mwc VyM= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:mP3S2R2FlTHArHCusmDT+DRfVm0co7zxezQtwd8ZsesWLf/xwZ3uMQTl6Ol3ixeRBMOHsq0C0bKd7vGocFdDyK7JiGoFfp1IWk1NouQttCtkPvS4D1bmJuXhdS0wEZcKflZk+3amLRodQ56mNBXdrXKo8DEdBAj0OxZrKeTpAI7SiNm82/yv95HJbAhEmTiwbalsIBmqogncts0bipZ+J6gszRfEvmFGcPlMy2NyIlKTkRf85sOu85Nm7i9dpfEv+dNeXKvjZ6g3QqBWAzogM2Au+c3krgLDQheV5nsdSWoZjBxFCBXY4R7gX5fxtiz6tvdh2CSfIMb7Q6w4VSik4qx2ThLjlSUJOCMj8GzPisJ+kr9VrhyiqRJ4zIHab5qYOOZ9c67HYd8XX3ZNUtpXWidcAo28dYwPD+8ZMOhYtYbyvFoOogG4BQKxBO3v0CFHiWLo0q0g0uQuDQLG1xEnEtIAqnvbt9v1ObwJUeC2zKjIyyvMb+9M1Tjm9ofFaxYsquyDUrxsa8Te01UvFx/bgVWKr4zoJz2b2+cJvmab7udtVfyjhmAnpQxsvjSj29sgh4jGiIwa113J+zt0zZs1KNC6VkN1bsKoHpVfuSyeN4V4Qt0uTmVutS0nybMGoYa2cSwXxJg92hLSaOKLf5KV7h/iVOudOyp0iXNjdbminRi961Kgxff5VsSs1VZKqTdKncfUu3AW0hzT9tCHSvxg/ke9wTqP1x7c6uVDIU0skarbLIIuzaQ0lpoTtkTDBTP2lF/yjK+Rakor4Oyo5PngYrXjvJCcNol0hhn/MqQohMO/Hfw1PwwTU2SB5Oix16Pv8VfkTLhLjvA6iLTVvZHCKcQevKG5AgtV0og56xa4CjeryNoYkmMcI1JLYx+HlIvpOlHIIP/mEfezmU+jnylzy/DcIrLhGonNLmTEkLr5YLly8VBcxxQ2zd1E+p1bEK8BL+z2Wk/1s9zYAAM5Pxayw+n5FNV3zpkeVn6XAq+FLKPStkeF5uEyI+aXfoAYozX9JOY/5/7ok3A5nUURfa6z3ZsYcHq4BOhpI12FYXrwhdcMCWIKvgkjTOPxllKNTSBcZ3WpUqIn+zE7E5ypAZ3fSYGsmLaBxju0HoVKZmBaDVCBCXHoeJuYW/gRdi2SPNRskiILVbe/UY8tzxKuuxHgy7phMOXU/jcUtZX51Nh6/+fTjw099SRoD8SB1GGAV2V0nmIORz8r06FzuE99xUmZ0ah+nfNYEcde5+1GUggkL57Q1e96BM7oWgLHYNiJTEyqQtK8ATE+Vtgx2cMBY15hG9W+iRDOxySqDKUOmLyFH5E06aHc3nj3J8lj13bKzrIugEd1CvdIYGGvmKN63wTaGYPMl0KXi+CseLhYlC3Q/m6rzmeUukxcFglqXvbrR3caM2Xfp9Xw4AvsVbKiBK4mOQgJncCLIKVicd74i1haAv3uboeNK1mtknu9UE7bjoiHa5DnLj0Q X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJikgQLAQEBAQEBAQEBNQECBAEBhEuCMSU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig0cLASMjgT8SgyaCWCm4PzOEEIURgUKBNgIBAQEBiCuFGoFBP4ERg06KNASaW5xignGDE4RpkkwPIqEQkwiiGIF6TSAYgyRQGQ2OKxeOJkIwNwIGCgEBAwlXAT0Bjh8BAQ X-IPAS-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJikgQLAQEBAQEBAQEBNQECBAEBhEuCMSU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig0cLASMjgT8SgyaCWCm4PzOEEIURgUKBNgIBAQEBiCuFGoFBP4ERg06KNASaW5xignGDE4RpkkwPIqEQkwiiGIF6TSAYgyRQGQ2OKxeOJkIwNwIGCgEBAwlXAT0Bjh8BAQ Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 25 Sep 2020 15:16:59 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org Cc: mkubecek@suse.cz, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Fabian Frederick Subject: [PATCH V2 3/5 net-next] vxlan: move encapsulation warning Date: Fri, 25 Sep 2020 15:16:39 +0200 Message-Id: <20200925131639.56564-1-fabf@skynet.be> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org vxlan_xmit_one() was only called from vxlan_xmit() without rdst and info was already tested. Emit warning in that function instead Signed-off-by: Fabian Frederick --- drivers/net/vxlan.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index cc904f003f158..14f903d09c010 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2650,11 +2650,6 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, udp_sum = !(flags & VXLAN_F_UDP_ZERO_CSUM6_TX); label = vxlan->cfg.label; } else { - if (!info) { - WARN_ONCE(1, "%s: Missing encapsulation instructions\n", - dev->name); - goto drop; - } remote_ip.sa.sa_family = ip_tunnel_info_af(info); if (remote_ip.sa.sa_family == AF_INET) { remote_ip.sin.sin_addr.s_addr = info->key.u.ipv4.dst; @@ -2889,6 +2884,10 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) info->mode & IP_TUNNEL_INFO_TX) { vni = tunnel_id_to_key32(info->key.tun_id); } else { + if (!info) + WARN_ONCE(1, "%s: Missing encapsulation instructions\n", + dev->name); + if (info && info->mode & IP_TUNNEL_INFO_TX) vxlan_xmit_one(skb, dev, vni, NULL, false); else From patchwork Fri Sep 25 13:16:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1371292 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4ByXWn6G6Fz9sSn for ; Fri, 25 Sep 2020 23:17:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728926AbgIYNRW (ORCPT ); Fri, 25 Sep 2020 09:17:22 -0400 Received: from mailrelay112.isp.belgacom.be ([195.238.20.139]:53084 "EHLO mailrelay112.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728171AbgIYNRW (ORCPT ); Fri, 25 Sep 2020 09:17:22 -0400 IronPort-SDR: USMfB1R/kPsaPPtMKtrw6y4KpdXbRn9yttPoAEjW98AUBN5H/7t9qQLV9gnatcQMyQEfL8HqRI JisXZ7sgVHzp6zaIAm8o1ASnzPywfSEnnIxb/5pFqcz/hbaoeRbKBZ1Y9cp0Ve2b8LP0jG0P2P k1EgUT0YEkp0qZBaK/uP7g6HKcwM68ApyNsUpFCU9/k8E5Xw6PT+okmfR4JvW1PTc9ZPC+Px0g vT4pQ8TQFTiG26FdkC8s8mxdu1MFUk8TXHwR3gWY5P8X/GNoeT5iS0mBFiT7C51I5qDx+6axi4 GK8= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:qocG0xK5Wts6YGvlj9mcpTZWNBhigK39O0sv0rFitYgXKvv4rarrMEGX3/hxlliBBdydt6sbzbCO+P2xEUU7or+5+EgYd5JNUxJXwe43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6arXK99yMdFQviPgRpOOv1BpTSj8Oq3Oyu5pHfeQpFiCe/bL9oMhm6sQrdu8kSjIB/Nqs/1xzFr2dSde9L321oP1WTnxj95se04pFu9jlbtuwi+cBdT6j0Zrw0QrNEAjsoNWA1/9DrugLYTQST/HscU34ZnQRODgPY8Rz1RJbxsi/9tupgxCmXOND9QL4oVTi+6apgVRnlgzoFOTEk6mHaksx+grxGrhyvpBJxxIHbbo6OOfZifa7QZ88WSHBdUspNUSFKH4Oyb5EID+oEJetWr5PyqEAPrRSkAwmnGePhyiVWiXDrw6I6yeUhHh3F3Ac9GN8Ovm7bo877NKoJSuC1z6nJzTPdYPNKwzvy85bHfwknrPqRUr1+bdDfxlMzFwPZkFqQs4rlMiub2OkOt2WV7+ttWOKxh2Mpqw98vySjytowhoTIiYwbxU3J+CtnzYsoJdC1SlB2b9G4HJVeuC+XM4t4TMM8T2xsvisx174IuYajcSUO1Zgr3QPTZv+Zf4SS/x7uVeacLS1liH9kfr+0mgy8/lK6yuLmU8m5yFNKri1YndbSrn0NzBnT6tSfSvt640ehxS6D1wDN5eFAJkA5ja7bK5k9zbEqkpoTsUPDHjTqmEnsiK+WcVkr9fKs6+v6ZbXmo4WTN45yig3mM6QunNKwAfggPwUKQmSX4/mw2b798UHjXblHj/07nrPEvJ3bPcgbo7S2Aw5R0oYt8Ra/CDKm3cwWnXYdN11FdgmKj5PqO1DOJvD3E+u/j063nzh13/zGJKHuAo3RLnjfl7fsZaty5FRCyAUtyNBS/I9bBasfIP3tX0/xsNvYDhElMwCuxeboFsl93JsEWW2TGq+ZLL/SsViQ6+IsPumDf5UatS3+K/c7/f7ui2E2mVsHcamux5sXZ2iyHu56LEWBfXrsntABHH8Pvgo9Uezlk0ONXiJNaHaxRK88/Sw7CJm4AovZWo+sgaSL3D2nEZ1OemBGFleMHG/ud4qaR/cDdTydItF6nzwaWriuVZUh2QuttADk0bpnKPTb+ikCuZLkzth16PXZlQsu+jxsE8Sdz2aNQnlwnmMJQT82wa9+rVV+ylidy6h4heJXFdhI6vNXXQc1K4Tcw/Z5C9/sQALBeMmGSFK8TtWhGzExQco7w8USbEZlB9WikhfD0jKkA7APjLOLCoc58rnf33nxIcZy1WrG2LM6gFY4EYNzMjiqj7By8iDfDpDElkGembrsc6kAmGbO6W2K5WmDpkdVVEh3S6qWc2oYYx74pN7470WKYaWjBbk9MwBCgZqMI6FEQsbqnFNLWLHpNYKNMCqKh26sCEPQlfu3Z43wdjBF0Q== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJiiliHLAsBAQEBAQEBAQE1AQIEAQGES4IxJTgTAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDUgEjI4E/EoMmglgpuHKEEIURgUKBNgIBAQEBiCuFGoFBP4ERg06EBIYwBLc9gnGDE4RpkkwPIoJ7nhUtkluiGIF6TSAYgyRQGQ2caEIwNwIGCgEBAwlXAT0Bi1mCRgEB X-IPAS-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJiiliHLAsBAQEBAQEBAQE1AQIEAQGES4IxJTgTAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDUgEjI4E/EoMmglgpuHKEEIURgUKBNgIBAQEBiCuFGoFBP4ERg06EBIYwBLc9gnGDE4RpkkwPIoJ7nhUtkluiGIF6TSAYgyRQGQ2caEIwNwIGCgEBAwlXAT0Bi1mCRgEB Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 25 Sep 2020 15:17:20 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org Cc: mkubecek@suse.cz, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Fabian Frederick Subject: [PATCH V2 4/5 net-next] vxlan: check rtnl_configure_link return code correctly Date: Fri, 25 Sep 2020 15:16:59 +0200 Message-Id: <20200925131659.56615-1-fabf@skynet.be> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtnl_configure_link is always checked if < 0 for error code. Signed-off-by: Fabian Frederick --- drivers/net/vxlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 14f903d09c010..1e9ab1002281c 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -3890,7 +3890,7 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev, } err = rtnl_configure_link(dev, NULL); - if (err) + if (err < 0) goto unlink; if (f) { From patchwork Fri Sep 25 13:17:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1371293 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4ByXX738X6z9sS8 for ; Fri, 25 Sep 2020 23:17:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728939AbgIYNRk (ORCPT ); Fri, 25 Sep 2020 09:17:40 -0400 Received: from mailrelay112.isp.belgacom.be ([195.238.20.139]:53128 "EHLO mailrelay112.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728148AbgIYNRk (ORCPT ); Fri, 25 Sep 2020 09:17:40 -0400 IronPort-SDR: iSyu2GFpLieY1mj/lx1m2Sc+lTimUv4gFxSXnKLXQydqZA2k7O1NjPL26a9DF/h9gnYhuw0lEj BIf09xKVANJUrxD6DcOWqaI50DwTE/iwusuKSe2RhBExQlQO8zMOJ7NOrpS0U4yRrg3Vepzhv+ BYltoYR7ToUvMnqFXjB3x93RyV2hGSkDzHU8e0qRewzxfa+kdfPRVYpCPGjHnki4UwmBCP3gJx NhbxdWPHubO9o23c7Lrlx3QEtgCUVZTN2uaqmI475TCd5mnV2S5zCfiSyYpJ+96W5AVxQk9pKH Lso= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:tYWiKh+zboh1E/9uRHKM819IXTAuvvDOBiVQ1KB+0+0VIJqq85mqBkHD//Il1AaPAdyEragcwLeH+4nbGkU4qa6bt34DdJEeHzQksu4x2zIaPcieFEfgJ+TrZSFpVO5LVVti4m3peRMNQJW2aFLduGC94iAPERvjKwV1Ov71GonPhMiryuy+4ZLebxhKiTanf79+MBq6oAXVu8ILnYZsN6E9xwfTrHBVYepW32RoJVySnxb4+Mi9+YNo/jpTtfw86cNOSL32cKskQ7NWCjQmKH0169bwtRbfVwuP52ATXXsQnxFVHgXK9hD6XpP2sivnqupw3TSRMMPqQbwoXzmp8qFmQwLqhigaLT406GHZhNJtgqxVoxyvoBNwzYHPbY2JN/dzZL/RcMkGSWZdWMtaSixPApm7b4sKF+cPPfxXoJL8p1QUqxu1GAmiBPnxxTBVmHD2x6w63PgiEQrb2wEgEcgBv2/arNjuL6cSUuC0zK/WwjXfdf9Zwiny5ZHOfxs8rv6CQah+ftDNyUkzCQzFlFOQpJTrMT6W0ukDs2mW4up+We+hi2Aqth19riWzysothYfHiZ8Yx17a+ChkwIs4J8O1RkFnbdCqH5VdsyGUOYtoTs4mRWxjpSU0yqUetJO/YSQG0okryh3BZ/CdboSF4xLuWPyMLTp5gn9uZaixiAyo8Ue6z+3xTsy00FFXoSVbitTMrXUN1wDL6siAV/t94l+t2TaR2ADX7eFJOUQ0la3HJJE7xr4wlp0TsV/fHiPsnEX2i7OZeV8g+ue17OTnZ6/ppp6aN4NsiwH+NLohmtCnDOk8LwQCRXWX9Oei2LH54EH0QbVHgucrnqTYqJzaIN4Upq+9Aw9byIYj7BO/Ai+o0NsChnYHIklIeAmEj4npPVHBPuz4Ae2kjFuyiDtr3ezJPqX9ApXRKXjOiKrucqxj60FCzQo+1s1Q6IhKCr4fJfLzXkjxtNLEDhMjNQy73frnAs1n1owCQWKPHrOZMKTKvF+L++IgOPODaZQWuDnjMfgl4eDhjXsjlV8aZ6mp0oMdaGqkEfR+P0WZfX3sj88EEWcJowoxV/Llh0GcXj5QfHuyRL885iolB468EYjCR5ingKad0yejAp1WemdGB0iKEXj2a4WLRukDaDyJL89/nTwLS6KhR5Ui1R6wrg/6zaRoLu7O9i0fr5Lj28B/5/fPmhEq6Tx0E8Od3nmJT2F1mGMIWjA30Ll8oUNj0FeD17Z3g/hDGNxN6PNGTB06OYTfz+NkEdDyXBzOftOTRFahWNWmDik7TsgtzN8Wf0Z9B9KigwjN3yWwGLAVmaeGBIc38qPc2Xj+Odp9x2zd26Y/3BEaRZ5DPHOrg4Zz/hbeAorOnVnfkau2MewfwSTE3GSO12yDuAdfSgEjf7/CWCUxb0HXpNKxyFnPQ7K0CL8kel9PwMSMArBJe9vkkRNMSaGwa5zlf2utljLoVl6zzbSWYd+ydg== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJikgQLAQEBAQEBAQEBNQECBAEBhEuCMSU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig0cLASMjgT8SgyaCWCm4PzOEEIURgUKBNgIBAQEBiCuFGoFBP4RfihIiBLc9gnGDE4RpkkwPIqEQLZJbm1SGRIF6TSAYO4JpUBkNnGhCMDcCBgoBAQMJVwE9AY4fAQE X-IPAS-Result: A2ASEgDD7G1f/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQGCLV+NPpJikgQLAQEBAQEBAQEBNQECBAEBhEuCMSU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig0cLASMjgT8SgyaCWCm4PzOEEIURgUKBNgIBAQEBiCuFGoFBP4RfihIiBLc9gnGDE4RpkkwPIqEQLZJbm1SGRIF6TSAYO4JpUBkNnGhCMDcCBgoBAQMJVwE9AY4fAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 25 Sep 2020 15:17:37 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org Cc: mkubecek@suse.cz, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Fabian Frederick Subject: [PATCH V2 5/5 net-next] vxlan: fix vxlan_find_sock() documentation for l3mdev Date: Fri, 25 Sep 2020 15:17:17 +0200 Message-Id: <20200925131717.56666-1-fabf@skynet.be> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since commit aab8cc3630e32 ("vxlan: add support for underlay in non-default VRF") vxlan_find_sock() also checks if socket is assigned to the right level 3 master device when lower device is not in the default VRF. Signed-off-by: Fabian Frederick --- drivers/net/vxlan.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 1e9ab1002281c..fa21d62aa79c9 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -190,8 +190,9 @@ static inline struct vxlan_rdst *first_remote_rtnl(struct vxlan_fdb *fdb) return list_first_entry(&fdb->remotes, struct vxlan_rdst, list); } -/* Find VXLAN socket based on network namespace, address family and UDP port - * and enabled unshareable flags. +/* Find VXLAN socket based on network namespace, address family, UDP port, + * enabled unshareable flags and socket device binding (see l3mdev with + * non-default VRF). */ static struct vxlan_sock *vxlan_find_sock(struct net *net, sa_family_t family, __be16 port, u32 flags, int ifindex)