From patchwork Wed Nov 24 20:24:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12637721 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D032C433F5 for ; Wed, 24 Nov 2021 20:24:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229844AbhKXU2D (ORCPT ); Wed, 24 Nov 2021 15:28:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229516AbhKXU2C (ORCPT ); Wed, 24 Nov 2021 15:28:02 -0500 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92867C061574 for ; Wed, 24 Nov 2021 12:24:52 -0800 (PST) Received: by mail-pj1-x102b.google.com with SMTP id nh10-20020a17090b364a00b001a69adad5ebso3784456pjb.2 for ; Wed, 24 Nov 2021 12:24:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s43d+9BX0Hd2V+V+j1yYegEqFVRTQMe6t+GR06hayE4=; b=EkGt3KflMVH7V9XvOSevppAguHlLLP2s2TNqbyGc98y3SNZmdUj1P0pzbY6dOn+H0e j7x86hpnt3nKclMZMZOJf9U7mEMln6+Z1yd2NF5R3lnBiUCfve2EkyOb4OUW4leHEd5E r/EAOha3Zi4IkL96fN2nBe3vRVv/hXVBc5C/uvi/ujxkNg6eXsail9zAStVNoANn8z9O ygLWkAF5vG/SP4qyKvdGB7yKM5xebdln5hSYU8vKPLXSJUDiYkRg2jNUQ2JNjZ+YPDBg Cz1rPZbYlBANgyaWWMzysIGIrQE34kzJiMaYJZl3ZeszzWQJxZqTDtrJxdST6QPq2F2p XzBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s43d+9BX0Hd2V+V+j1yYegEqFVRTQMe6t+GR06hayE4=; b=fqhT6ORrUe5uYIj3SZQsVNxxjH6yZmBnu6+0i8RxNavCe0dvq/bgpJIM/sNCalgS4F a25jnl71lUO638YRbuVOzLFfiaDFmRbqvbmQ3nY8wd/wVkh86MjUQ9VOUVIItro9+/cP eV6nvMKdzbTDf1Ky1cdbq6pcuCMUDE608WTqtn5DC7XYJrgdNMrA+Pf24Z19jsE0Ya4s 6rRZpsQTvK+ajeGmqn7cGLSBMqlAzJHZugAtv1dDZA5A2Q1uNDO47w7Itgmzc6PyoLiS eueb0PHqY75WZkyCiEG6vnvYHMgvyj9+aWD4o2O4/bTeIAJM6LSJ/vevE4PRW/8NRa33 m4Zg== X-Gm-Message-State: AOAM530n8qnsVnhTiCM7o9g9YxA348QHC4K7NeBvFZ3QLuxj8dMTX09Y pkoQfuaBPFELc+knmx8W1sk= X-Google-Smtp-Source: ABdhPJxiA5wy6IWv9iIHKcKTT1SRXMunoaKqOXcXWwRheaCrg9Q87i6E7eFACl4z9gXgjFE8ifkGcQ== X-Received: by 2002:a17:90a:f481:: with SMTP id bx1mr19694698pjb.117.1637785492154; Wed, 24 Nov 2021 12:24:52 -0800 (PST) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:b6ed:6a42:8a10:2f32]) by smtp.gmail.com with ESMTPSA id i10sm472839pjd.3.2021.11.24.12.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 12:24:51 -0800 (PST) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 1/2] gro: optimize skb_gro_postpull_rcsum() Date: Wed, 24 Nov 2021 12:24:45 -0800 Message-Id: <20211124202446.2917972-2-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211124202446.2917972-1-eric.dumazet@gmail.com> References: <20211124202446.2917972-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet We can leverage third argument to csum_partial(): X = csum_sub(X, csum_partial(start, len, 0)); --> X = csum_add(X, ~csum_partial(start, len, 0)); --> X = ~csum_partial(start, len, ~X); This removes one add/adc pair and its dependency against the carry flag. Signed-off-by: Eric Dumazet --- include/net/gro.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/gro.h b/include/net/gro.h index 9c22a010369cb89f9511d78cc322be56170d7b20..b1139fca7c435ca0c353c4ed17628dd7f3df4401 100644 --- a/include/net/gro.h +++ b/include/net/gro.h @@ -173,8 +173,8 @@ static inline void skb_gro_postpull_rcsum(struct sk_buff *skb, const void *start, unsigned int len) { if (NAPI_GRO_CB(skb)->csum_valid) - NAPI_GRO_CB(skb)->csum = csum_sub(NAPI_GRO_CB(skb)->csum, - csum_partial(start, len, 0)); + NAPI_GRO_CB(skb)->csum = ~csum_partial(start, len, + ~NAPI_GRO_CB(skb)->csum); } /* GRO checksum functions. These are logical equivalents of the normal From patchwork Wed Nov 24 20:24:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12637723 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8C9CC433F5 for ; Wed, 24 Nov 2021 20:24:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230115AbhKXU2G (ORCPT ); Wed, 24 Nov 2021 15:28:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229516AbhKXU2D (ORCPT ); Wed, 24 Nov 2021 15:28:03 -0500 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1874C061574 for ; Wed, 24 Nov 2021 12:24:53 -0800 (PST) Received: by mail-pf1-x435.google.com with SMTP id g19so3722456pfb.8 for ; Wed, 24 Nov 2021 12:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Yl0DG04mAxYInvrXqkjaY7TbRYAflil46ikhnClhS0=; b=bW5UKkmWFcueYJiHtHAq7pwIiNrz0g0IQlYhDD9r4h0wUnJMi51nTDUdGIbtYro3Kb RLsikSJZWeiTzUxNnqZ9aX/ZsJ8paKQf8DH2sAONVjW950BwMFjVtyUOexv076WTP9+m wCwslGWUGX1PoIkcB/OPMO+e9TjniZnV6FMV4ZE+e3VuiWG1r0ujUm2OK8DvfvuJ0lLK eIymnUaiA/vw+JSM28mnY02N66vDqrOzRLYJ/AGqQmQn7LzQxm8vUc4OmMcmy1orc1uC xi+UvPJD0f5BG65CjFIRde/T7/3v8aynjlMPP5nF/1qym8zJGlILGpwwtS1GKsPaPVck I9Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Yl0DG04mAxYInvrXqkjaY7TbRYAflil46ikhnClhS0=; b=uCnHi44HoBk81gzPrjx9ezBDY6kirii7YvNNg6NLiagGgf8v29hjOID5wUeOc1WeEA zqisv2jbrlCsXusvrtMaTeReclrt4+Lw7HEClZPmW2c5FnmIfAXEFwDTy9/p38hvYRM/ YJQUFcAcVDF8NdxGeRyVMJCl+qKAa7dSM3lHlp6pIrtCbZ+/EydAKzXqtQL/STU4vZTO Gmf55aonopG/MI1obRuTzhhNoURj6y5qvz7aIW17ZI7p8xpAp1WcBkZC7+ehvsYBUKLt qReoj1R+aijPwTC6ZDNmL8wNku6fmi8VeJAqIro3S9o2euymCeMk+vdaIl8mfnuXNMJu S0xQ== X-Gm-Message-State: AOAM530gK4u1fleMFhcvuciYsRUd1IAxb2xTqncnMELiBK5VzgPf5nqB l3m0VfM/GwUymWiceoeHXIA= X-Google-Smtp-Source: ABdhPJyB4pz1Yd0kl2j69s5xIu2yYG6yexTD969UBMVtU7Ci8FBxrObh8rOBdyKy8EFeAOCIU24QuQ== X-Received: by 2002:a05:6a00:248f:b0:4a0:1e25:3155 with SMTP id c15-20020a056a00248f00b004a01e253155mr9135168pfv.21.1637785493477; Wed, 24 Nov 2021 12:24:53 -0800 (PST) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:b6ed:6a42:8a10:2f32]) by smtp.gmail.com with ESMTPSA id i10sm472839pjd.3.2021.11.24.12.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 12:24:53 -0800 (PST) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 2/2] net: optimize skb_postpull_rcsum() Date: Wed, 24 Nov 2021 12:24:46 -0800 Message-Id: <20211124202446.2917972-3-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211124202446.2917972-1-eric.dumazet@gmail.com> References: <20211124202446.2917972-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Dumazet Remove one pair of add/adc instructions and their dependency against carry flag. We can leverage third argument to csum_partial(): X = csum_block_sub(X, csum_partial(start, len, 0), 0); --> X = csum_block_add(X, ~csum_partial(start, len, 0), 0); --> X = ~csum_partial(start, len, ~X); Signed-off-by: Eric Dumazet --- include/linux/skbuff.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index eba256af64a577b458998845f2dc01a5ec80745a..eae4bd3237a41cc1b60b44c91fbfe21dfdd8f117 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3485,7 +3485,11 @@ __skb_postpull_rcsum(struct sk_buff *skb, const void *start, unsigned int len, static inline void skb_postpull_rcsum(struct sk_buff *skb, const void *start, unsigned int len) { - __skb_postpull_rcsum(skb, start, len, 0); + if (skb->ip_summed == CHECKSUM_COMPLETE) + skb->csum = ~csum_partial(start, len, ~skb->csum); + else if (skb->ip_summed == CHECKSUM_PARTIAL && + skb_checksum_start_offset(skb) < 0) + skb->ip_summed = CHECKSUM_NONE; } static __always_inline void