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=-5.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 28F53C33C9E for ; Wed, 29 Jan 2020 00:18:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFB7521739 for ; Wed, 29 Jan 2020 00:18:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="ecLBFq3o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726338AbgA2ASu (ORCPT ); Tue, 28 Jan 2020 19:18:50 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:43694 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726307AbgA2ASu (ORCPT ); Tue, 28 Jan 2020 19:18:50 -0500 Received: by mail-pf1-f196.google.com with SMTP id s1so6909197pfh.10 for ; Tue, 28 Jan 2020 16:18:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Xu0t7fQFOPxeBK58JhveLHReraKm9bUYSb0AKFkvn/Y=; b=ecLBFq3oczw0ffuQm/J+InSnKBAUPAv8869Xc/2a5qLYe2jSwpwbmYj8nsV0a71Twt IZ11Fmx0g0xz+57FSlOy6uL+anS82lUJGOY/XY+ipXTVS5CQCJslLiT+KAGBV49v1ljA WAEMKPJGTP1AAsode9vw1OreOTu0I9U+GtABSYXOcINnewILjNmOZ9HE4ilhOzjOGpo3 4oigRdjVVnD1mjX+LsHGoU7PFMEoB/5JpS4ioJAaTVXPokn7uB2qCq5mYxnle7wNczMj vJzNL4Wh/+1fHsniRl+PCPVieU4/76817w3o+DbymJsbI9j7Qfv5TwWSLiMtJ4xH8hgD 0YzA== 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=Xu0t7fQFOPxeBK58JhveLHReraKm9bUYSb0AKFkvn/Y=; b=a05ut7A4r+JRxHEVYCtkvnCMthgiSzzvOf5u3jPbq8Zed6gp0cN0Ev3UO6cSxpfA/r 4YoxLejqUI48HwZG5zYakI0DK4h2wCqqqob9oMPr2uK1/dr9UaCw1+wJlFtPAKx1EDhL iHRLYVAxWhM58VmTqMRSFcwXDR6CfrK+P//vmPGB77EYRt2AnrCF2Tw81YJqyIAd6z5L 6Ms7rDzA6mI4i25bqFqqoO5Zpdc+IatGeJ+FwtauOQ2hwLr2dSwnc0xv4x34ciK/qV/8 TPBJWtC+VW0+Ok80adfMunfRfxu8L/Ks9XMp2tVOvgFPmMT+kno8rZL8iVeiga1Zl65d g7LQ== X-Gm-Message-State: APjAAAVUAABknhqLLQ1pW/UgVB2o4O05YpWi9F2JgC/JuumSE3i+jInF bcynyAT0qiCaHOtbmcKfT0DStw== X-Google-Smtp-Source: APXvYqxHgZkaGIBKVJrxFT0ryGUAAWh3XtK5Z4Ea5Gq9qWbw+MPmRwZ92FhWTJR8CtwbF0WMNB+66w== X-Received: by 2002:a63:5f84:: with SMTP id t126mr26845132pgb.71.1580257129418; Tue, 28 Jan 2020 16:18:49 -0800 (PST) Received: from [192.168.1.188] ([66.219.217.145]) by smtp.gmail.com with ESMTPSA id y2sm184158pff.139.2020.01.28.16.18.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2020 16:18:49 -0800 (PST) Subject: Re: IORING_REGISTER_CREDS[_UPDATE]() and credfd_create()? From: Jens Axboe To: Pavel Begunkov , Stefan Metzmacher Cc: io-uring , Linux API Mailing List References: <688e187a-75dd-89d9-921c-67de228605ce@samba.org> <1ac31828-e915-6180-cdb4-36685442ea75@kernel.dk> <0d4f43d8-a0c4-920b-5b8f-127c1c5a3fad@kernel.dk> <2d7e7fa2-e725-8beb-90b9-6476d48bdb33@gmail.com> <6c401e23-de7c-1fc1-4122-33d53fcf9700@kernel.dk> <35eebae7-76dd-52ee-58b2-4f9e85caee40@kernel.dk> <6415ae98-e205-5374-296d-0442e1ed2034@kernel.dk> Message-ID: Date: Tue, 28 Jan 2020 17:18:47 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <6415ae98-e205-5374-296d-0442e1ed2034@kernel.dk> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: io-uring-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org On 1/28/20 5:15 PM, Jens Axboe wrote: > On 1/28/20 5:10 PM, Pavel Begunkov wrote: >> On 29/01/2020 02:51, Jens Axboe wrote: >>> On 1/28/20 4:40 PM, Jens Axboe wrote: >>>> On 1/28/20 4:36 PM, Pavel Begunkov wrote: >>>>> On 28/01/2020 22:42, Jens Axboe wrote: >>>>>> I didn't like it becoming a bit too complicated, both in terms of >>>>>> implementation and use. And the fact that we'd have to jump through >>>>>> hoops to make this work for a full chain. >>>>>> >>>>>> So I punted and just added sqe->personality and IOSQE_PERSONALITY. >>>>>> This makes it way easier to use. Same branch: >>>>>> >>>>>> https://git.kernel.dk/cgit/linux-block/log/?h=for-5.6/io_uring-vfs-creds >>>>>> >>>>>> I'd feel much better with this variant for 5.6. >>>>>> >>>>> >>>>> Checked out ("don't use static creds/mm assignments") >>>>> >>>>> 1. do we miscount cred refs? We grab one in get_current_cred() for each async >>>>> request, but if (worker->creds != work->creds) it will never be put. >>>> >>>> Yeah I think you're right, that needs a bit of fixing up. >>> >> >> Hmm, it seems it leaks it unconditionally, as it grabs in a ref in >> override_creds(). >> >>> I think this may have gotten fixed with the later addition posted today? >>> I'll double check. But for the newer stuff, we put it for both cases >>> when the request is freed. >> >> Yeah, maybe. I got tangled trying to verify both at once and decided to start >> with the old one. >> >> >>>>> 2. shouldn't worker->creds be named {old,saved,etc}_creds? It's set as >>>>> >>>>> worker->creds = override_creds(work->creds); >>>>> >>>>> Where override_creds() returns previous creds. And if so, then the following >>>>> fast check looks strange: >>>>> >>>>> worker->creds != work->creds >>>> >>>> Don't care too much about the naming, but the logic does appear off. >>>> I'll take a look at both of these tonight, unless you beat me to it. >> >> Apparently, you're faster :) >> >>> >>> Testing this now, what a braino. >>> >>> diff --git a/fs/io-wq.c b/fs/io-wq.c >>> index ee49e8852d39..8fbbadf04cc3 100644 >>> --- a/fs/io-wq.c >>> +++ b/fs/io-wq.c >>> @@ -56,7 +56,8 @@ struct io_worker { >>> >>> struct rcu_head rcu; >>> struct mm_struct *mm; >>> - const struct cred *creds; >>> + const struct cred *cur_creds; >>> + const struct cred *saved_creds; >>> struct files_struct *restore_files; >>> }; >>> >>> @@ -135,9 +136,9 @@ static bool __io_worker_unuse(struct io_wqe *wqe, struct io_worker *worker) >>> { >>> bool dropped_lock = false; >>> >>> - if (worker->creds) { >>> - revert_creds(worker->creds); >>> - worker->creds = NULL; >>> + if (worker->saved_creds) { >>> + revert_creds(worker->saved_creds); >>> + worker->cur_creds = worker->saved_creds = NULL; >>> } >>> >>> if (current->files != worker->restore_files) { >>> @@ -424,10 +425,11 @@ static void io_wq_switch_mm(struct io_worker *worker, struct io_wq_work *work) >>> static void io_wq_switch_creds(struct io_worker *worker, >>> struct io_wq_work *work) >>> { >>> - if (worker->creds) >>> - revert_creds(worker->creds); >>> + if (worker->saved_creds) >>> + revert_creds(worker->saved_creds); >>> >>> - worker->creds = override_creds(work->creds); >>> + worker->saved_creds = override_creds(work->creds); >>> + worker->cur_creds = work->creds; >>> } >> >> How about as follows? rever_creds() is a bit heavier than put_creds(). >> >> static void io_wq_switch_creds(struct io_worker *worker, >> struct io_wq_work *work) >> { >> const struct cred *old_creds = override_creds(work->creds); >> >> if (worker->saved_creds) >> put_cred(old_creds); >> else >> worker->saved_creds = old; >> worker->cur_creds = work->creds; >> } > > Looks good to me, I'll fold. Actually, it doesn't clear current->cred then, which seems a bit.. unfortunate. Could be a source of issues. -- Jens Axboe