From owner-svn-src-head@freebsd.org Thu May 17 19:35:04 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA996EDE746; Thu, 17 May 2018 19:35:03 +0000 (UTC) (envelope-from mmacy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 936A472F94; Thu, 17 May 2018 19:35:03 +0000 (UTC) (envelope-from mmacy@freebsd.org) Received: from mail-io0-f175.google.com (mail-io0-f175.google.com [209.85.223.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) (Authenticated sender: mmacy) by smtp.freebsd.org (Postfix) with ESMTPSA id 5A9A314474; Thu, 17 May 2018 19:35:03 +0000 (UTC) (envelope-from mmacy@freebsd.org) Received: by mail-io0-f175.google.com with SMTP id e78-v6so3405687iod.0; Thu, 17 May 2018 12:35:03 -0700 (PDT) X-Gm-Message-State: ALKqPwdOe+hQymm5oc/wwsXLoR7IXSnT2np8Wl8xfWWu2UXqe3dBAI4p v73f6x7Ho/SJqcAeEliIF/2D5oVwCY/PXGNAExs= X-Google-Smtp-Source: AB8JxZpps82NW9t/pGQaAa3bDddA5j1YNCsS1mwYZ+9fVBsUw15eaVq+TocURHkxbKlCEAicHFOENnmdu0+VtT60Exo= X-Received: by 2002:a6b:a712:: with SMTP id q18-v6mr7039390ioe.237.1526585702878; Thu, 17 May 2018 12:35:02 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:3e4a:0:0:0:0:0 with HTTP; Thu, 17 May 2018 12:35:02 -0700 (PDT) In-Reply-To: <11fb642a-d334-bd7d-be4f-b1aa181b8eb2@FreeBSD.org> References: <201805171814.w4HIEA0F079835@repo.freebsd.org> <20180517203856.aa6b8b241e23b9c07483232b@bidouilliste.com> <17058056-6b70-e918-dab8-63951d1bfbbd@FreeBSD.org> <20180517212757.84c7b02060ca8f86e56dbee9@bidouilliste.com> <11fb642a-d334-bd7d-be4f-b1aa181b8eb2@FreeBSD.org> From: Matthew Macy Date: Thu, 17 May 2018 12:35:02 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r333745 - in head/sys/contrib/ck: include src To: Pedro Giffuni Cc: Emmanuel Vadot , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 19:35:04 -0000 On Thu, May 17, 2018 at 12:32 PM, Pedro Giffuni wrote: > > > On 17/05/2018 14:27, Emmanuel Vadot wrote: >> >> On Thu, 17 May 2018 14:20:05 -0500 >> Pedro Giffuni wrote: >> >>> On 17/05/2018 14:12, Matthew Macy wrote: >>>> >>>> How do I avoid problems while allowing timely updates? >>>> >>>> -M >>>> >>>> On Thu, May 17, 2018 at 11:38 AM, Emmanuel Vadot >>>> wrote: >>>>> >>>>> Hi Matt, >>>>> >>>>> On Thu, 17 May 2018 18:14:10 +0000 (UTC) >>>>> Matt Macy wrote: >>>>> >>>>>> Author: mmacy >>>>>> Date: Thu May 17 18:14:10 2018 >>>>>> New Revision: 333745 >>>>>> URL: https://svnweb.freebsd.org/changeset/base/333745 >>>>>> >>>>>> Log: >>>>>> ck: add support for executing callbacks outside of main poll loop >>>>>> >>>>>> Pull in change from upstream >>>>>> deca119d14bfffd440770eb67cbdbeaf7b57eb7b >>>>>> >>>>>> | ck_epoch: introduce ck_epoch_deferred >>>>>> | >>>>>> | Allow for deferral to occur outside epoch poll critical loop >>>>>> (which may access per-CPU structures). >>>>>> | >>>>>> >>>>>> Approved by: sbruno >>>>>> >>>>>> Modified: >>>>>> head/sys/contrib/ck/include/ck_epoch.h >>>>>> head/sys/contrib/ck/src/ck_epoch.c >>>>>> >>>>> CK was imported in vendor-sys/ck, commiting directly into head will >>>>> cause some problems in the future. >>> >>> Actually ... committing to head is fine: some things just have to be >>> fixed. >> >> This is not true, it can cause a lot of problems with futures updates >> if the change isn't in the vendor repo. > > OK ... I meant generally you can. The catch here is that the change was > already upstream so it should have been done in the vendor area and then > merged. It's best to fix this properly now. > > Sorry for misguiding. > I'm happy to comply - just point me at the fine manual. -M