From mboxrd@z Thu Jan 1 00:00:00 1970 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=-11.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 D81B6C433E0 for ; Tue, 22 Dec 2020 16:57:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABF6D23103 for ; Tue, 22 Dec 2020 16:57:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727795AbgLVQ5Z (ORCPT ); Tue, 22 Dec 2020 11:57:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726991AbgLVQ5Z (ORCPT ); Tue, 22 Dec 2020 11:57:25 -0500 Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D872C0613D3 for ; Tue, 22 Dec 2020 08:56:45 -0800 (PST) Received: by mail-ot1-x32c.google.com with SMTP id d20so12514173otl.3 for ; Tue, 22 Dec 2020 08:56:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=c5lpnq8f4m8C48I2U05aP6/lzHvCNt8Al3Z21qBvhuU=; b=BV26B3AEyONshCIUv4By7QMNPivMX6MjL9eyPPv3qSaaI8VtCJAQuTJLEGPGUorh9r evbzxTHRw2jf4ol/6Vjq8M5rrT9wJ1bBior/fnN2gCmx8DMVPAOWXR6CXrF3GFpBndUf CCsPFSYVVa+GJ4HmtWveE2UzB9H0JlxtTEbLUrHZzT5kraBF4k20sh/qqRAt5vYmKhoE whXhU8CaQd0cuS+2YjjD3mChzopOMGMVFuVfHSr9tOsGoEcYzrwsWKILRrbTp7L3uZlB 8Xv9XVgayMeFPjGtASDYLWQDI4oUJrZIElBMyZKmzJa3L9+R9uNPuvgILoGovYqiF/Bi Uqgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=c5lpnq8f4m8C48I2U05aP6/lzHvCNt8Al3Z21qBvhuU=; b=E1PALBpOcZaC7gjmgkhhiWxJv7yxo/N8I1UKFhEu09s2B+JYdRgv+V8xYs61cdgJRY +Lg5XxwMiGKhaNwyPwo/Bm2DaMuQs9WrnK2FrnSeDICd152fohhxIKcdD+o5RnHqw75i OusnlNEgIZ+lX27UzPz/pVnrnkzWzmxuyoT9IkvYf+fgraWYGlzNkuVuLOHp/MLrVYMK a3nY3y9neepFzgxHL1SaEP8FXglJ0NQ5ujzRmfCetVdfTIFxNi7hYLyxndh/e+uiMEVZ FJJW94U9C1+Sy1Jbey2MxihDGVyExfD3ZWrzZqLZq980UK6/5fIi7RO5DX4yIxeNoBRH pfpg== X-Gm-Message-State: AOAM5302eH/gpKM18hc4cZDP9En+hJxb1Yvobnmx6/gE9x9ABHbdtlSB qphf0HcSHPmso9FFpdtcaR2kLJcp6fA= X-Google-Smtp-Source: ABdhPJzscRzVww1cvXkz7vHrcLZqQk2qT3EzrMwJ2/tcPRVRtr7sYStLUhjK3RH8/fNNmEI6Nyv9PQ== X-Received: by 2002:a9d:2248:: with SMTP id o66mr1296396ota.236.1608656204386; Tue, 22 Dec 2020 08:56:44 -0800 (PST) Received: from Davids-MacBook-Pro.local ([2601:282:800:dc80:84d8:b3da:d879:3ea8]) by smtp.googlemail.com with ESMTPSA id x20sm4465528oov.33.2020.12.22.08.56.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Dec 2020 08:56:43 -0800 (PST) Subject: Re: [PATCH 03/12 v2 RFC] skbuff: simplify sock_zerocopy_put From: David Ahern To: Jonathan Lemon , netdev@vger.kernel.org, edumazet@google.com, willemdebruijn.kernel@gmail.com Cc: kernel-team@fb.com References: <20201222000926.1054993-1-jonathan.lemon@gmail.com> <20201222000926.1054993-4-jonathan.lemon@gmail.com> Message-ID: <88a4e130-c726-2782-6d9a-093e326c38b2@gmail.com> Date: Tue, 22 Dec 2020 09:56:43 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 12/22/20 9:52 AM, David Ahern wrote: > On 12/21/20 5:09 PM, Jonathan Lemon wrote: >> diff --git a/net/core/skbuff.c b/net/core/skbuff.c >> index 327ee8938f78..ea32b3414ad6 100644 >> --- a/net/core/skbuff.c >> +++ b/net/core/skbuff.c >> @@ -1245,12 +1245,8 @@ EXPORT_SYMBOL_GPL(sock_zerocopy_callback); >> >> void sock_zerocopy_put(struct ubuf_info *uarg) >> { >> - if (uarg && refcount_dec_and_test(&uarg->refcnt)) { >> - if (uarg->callback) >> - uarg->callback(uarg, uarg->zerocopy); >> - else >> - consume_skb(skb_from_uarg(uarg)); >> - } >> + if (uarg && refcount_dec_and_test(&uarg->refcnt)) >> + uarg->callback(uarg, uarg->zerocopy); >> } >> EXPORT_SYMBOL_GPL(sock_zerocopy_put); >> >> > > since it is down to 2 lines, move to skbuff.h as an inline? > nm. that is done in patch 5.