No description
  • C 98.2%
  • Assembly 1%
  • Makefile 0.3%
  • Shell 0.2%
  • Python 0.1%
Find a file
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Eric Biggers 8de6a8d30b ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32
With the existing fscrypt IV generation methods, each file's data blocks
have contiguous DUNs.  Therefore the direct I/O code "just worked"
because it only submits logically contiguous bios.  But with
IV_INO_LBLK_32, the direct I/O code breaks because the DUN can wrap from
0xffffffff to 0.  We can't submit bios across such boundaries.

This is especially difficult to handle when block_size != PAGE_SIZE,
since in that case the DUN can wrap in the middle of a page.  Punt on
this case for now and just handle block_size == PAGE_SIZE.

Add and use a new function fscrypt_dio_supported() to check whether a
direct I/O request is unsupported due to encryption constraints.

Then, update fs/direct-io.c (used by f2fs, and by ext4 in kernel v5.4
and earlier) and fs/iomap/direct-io.c (used by ext4 in kernel v5.5 and
later) to avoid submitting I/O across a DUN discontinuity.

(This is needed in ACK now because ACK already supports direct I/O with
inline crypto.  I'll be sending this upstream along with the encrypted
direct I/O support itself once its prerequisites are closer to landing.)

(cherry picked from android-mainline commit
 8d6c90c9d68b985fa809626d12f8c9aff3c9dcb1)

Conflicts:
	fs/ext4/file.c
	fs/iomap/direct-io.c

(Dropped the iomap changes because in kernel v5.4 and earlier,
 ext4 doesn't use iomap for direct I/O)

Test: For now, just manually tested direct I/O on ext4 and f2fs in the
      DUN discontinuity case.
Bug: 144046242
Change-Id: I0c0b0b20a73ade35c3660cc6f9c09d49d3853ba5
Signed-off-by: Eric Biggers <ebiggers@google.com>
2020-05-21 11:52:18 -07:00
arch This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
block ANDROID: block: backport the ability to specify max_dun_bytes 2020-05-15 22:01:33 +00:00
certs
crypto This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
Documentation BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_32 policies 2020-05-21 11:40:32 -07:00
drivers This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
fs ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32 2020-05-21 11:52:18 -07:00
include ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32 2020-05-21 11:52:18 -07:00
init This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
ipc This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
kernel This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
lib This is the 5.4.40 stable release 2020-05-11 09:59:15 +02:00
LICENSES
mm This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
net This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
samples This is the 5.4.36 stable release 2020-04-29 17:24:24 +02:00
scripts This is the 5.4.41 stable release 2020-05-14 08:55:48 +02:00
security This is the 5.4.39 stable release 2020-05-06 09:03:32 +02:00
sound This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
tools This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
usr initramfs: restore default compression behavior 2020-04-08 09:08:38 +02:00
virt KVM: arm: vgic: Synchronize the whole guest on GIC{D,R}_I{S,C}ACTIVER read 2020-05-20 08:20:04 +02:00
.clang-format
.cocciconfig
.get_maintainer.ignore
.gitattributes
.gitignore
.mailmap
abi_gki_aarch64.xml ANDROID: ABI/Whitelist: add ufs whitelist to unisoc whitelist 2020-05-18 11:12:37 +08:00
abi_gki_aarch64_cuttlefish_whitelist ANDROID: GKI: update abi and cf/gf whitelists 2020-04-29 16:08:21 -07:00
abi_gki_aarch64_db845c_whitelist ANDROID: ABI/Whitelist: update for db845c after changing drivers to modules. 2020-04-16 18:15:41 +00:00
abi_gki_aarch64_exynos_whitelist ANDROID: Add abi_gki_aarch64_exynos_whitelist 2020-05-01 10:19:00 +01:00
abi_gki_aarch64_goldfish_whitelist ANDROID: GKI: update abi and cf/gf whitelists 2020-04-29 16:08:21 -07:00
abi_gki_aarch64_hikey960_whitelist ANDROID: abi_gki_aarch64_hikey960_whitelist: remove stale symbols 2020-05-01 10:13:54 +01:00
abi_gki_aarch64_qcom_whitelist ANDROID: abi_gki_aarch64_qcom_whitelist: Sync with android-5.4 2020-05-01 10:13:54 +01:00
abi_gki_aarch64_sunxi_whitelist ANDROID: abi_gki_aarch64_sunxi_whitelist: remove stale symbols 2020-05-01 10:13:55 +01:00
abi_gki_aarch64_unisoc_whitelist ANDROID: ABI/Whitelist: add ufs whitelist to unisoc whitelist 2020-05-18 11:12:37 +08:00
abi_gki_aarch64_whitelist
build.config.aarch64 ANDROID: add compat cross compiler 2020-04-27 20:20:28 -07:00
build.config.allmodconfig ANDROID: fix allmodconfig build to use the right toolchain 2020-04-14 15:39:56 +00:00
build.config.allmodconfig.aarch64
build.config.allmodconfig.arm ANDROID: Add build.config files for ARM 32-bit 2020-03-15 22:51:11 +00:00
build.config.allmodconfig.x86_64
build.config.arm ANDROID: Add build.config files for ARM 32-bit 2020-03-15 22:51:11 +00:00
build.config.common ANDROID: clang: update to 11.0.1 2020-05-18 19:34:46 +00:00
build.config.db845c ANDROID: db845c build: Use merge_configs 2020-04-01 14:04:53 +00:00
build.config.gki
build.config.gki-debug.aarch64 ANDROID: Fix build.config.gki-debug 2020-05-04 09:11:56 +01:00
build.config.gki-debug.x86_64 ANDROID: Fix build.config.gki-debug 2020-05-04 09:11:56 +01:00
build.config.gki.aarch64 ANDROID: Enforce KMI stability 2020-05-06 12:10:15 +00:00
build.config.gki.x86_64
build.config.gki_kasan ANDROID: Rename build.config.gki.arch_kasan 2020-05-05 20:50:24 +00:00
build.config.gki_kasan.aarch64 ANDROID: Drop ABI monitoring from KASAN build config 2020-05-06 16:43:25 +00:00
build.config.gki_kasan.x86_64 ANDROID: Rename build.config.gki.arch_kasan 2020-05-05 20:50:24 +00:00
build.config.hikey960 ANDROID: hikey960: Add external mali driver support to build.config.hikey960 2020-03-23 22:55:17 +00:00
build.config.x86_64
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS
Makefile This is the 5.4.42 stable release 2020-05-20 12:49:59 +02:00
README
README.md

How do I submit patches to Android Common Kernels

  1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.

  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

  • All patches must conform to the Linux kernel coding standards and pass script/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry-picked from ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
    - then Joe Smith would upload the patch for the common kernel as
        UPSTREAM: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry-picked from ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [ Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
    - then Joe Smith would upload the patch for the common kernel as
        FROMGIT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
         https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        ANDROID: fix android-specific bug in foobar.c

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)